Skip to content

Commit

Permalink
Merge pull request cms-sw#56 from dtp2-tpg-am/littleChange
Browse files Browse the repository at this point in the history
Little change
  • Loading branch information
camilocarrillo authored Aug 16, 2019
2 parents cb2da4c + 1d6063e commit f0b1a69
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions L1Trigger/DTPhase2Trigger/src/MuonPathAssociator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ void MuonPathAssociator::correlateMPaths(edm::Handle<DTDigiCollection> dtdigis,
SL1metaPrimitive->wi2,SL1metaPrimitive->tdc2,SL1metaPrimitive->lat2,
SL1metaPrimitive->wi3,SL1metaPrimitive->tdc3,SL1metaPrimitive->lat3,
SL1metaPrimitive->wi4,SL1metaPrimitive->tdc4,SL1metaPrimitive->lat4,
SL3metaPrimitive->wi1,SL3metaPrimitive->tdc1,SL1metaPrimitive->lat5,
SL3metaPrimitive->wi2,SL3metaPrimitive->tdc2,SL1metaPrimitive->lat6,
SL3metaPrimitive->wi3,SL3metaPrimitive->tdc3,SL1metaPrimitive->lat7,
SL3metaPrimitive->wi4,SL3metaPrimitive->tdc4,SL1metaPrimitive->lat8,
SL3metaPrimitive->wi1,SL3metaPrimitive->tdc1,SL3metaPrimitive->lat1,
SL3metaPrimitive->wi2,SL3metaPrimitive->tdc2,SL3metaPrimitive->lat2,
SL3metaPrimitive->wi3,SL3metaPrimitive->tdc3,SL3metaPrimitive->lat3,
SL3metaPrimitive->wi4,SL3metaPrimitive->tdc4,SL3metaPrimitive->lat4,
-1
}));
at_least_one_correlation=true;
Expand Down
2 changes: 1 addition & 1 deletion Phase2L1Trigger/CalibratedDigis/plugins/CalibratedDigis.cc
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ CalibratedDigis::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
else {
//if (iEvent.eventAuxiliary().run() == 1) //FIX MC
if (scenario == 0) //FIX MC
newTime = digiTime - theSync->offset(wireId) + 25.0*400 + float(timeOffset_);
newTime = digiTime + 25.0*400;
else
newTime = digiTime - theSync->offset(wireId) + 25.0*iEvent.eventAuxiliary().bunchCrossing() + float(timeOffset_);
}
Expand Down

0 comments on commit f0b1a69

Please sign in to comment.