Skip to content

Commit 0c0e588

Browse files
missirolmissirol
committed
Revert "Fixes mismatches between emulator and fw on CDC dimuon seed"
This reverts commit c8aefec.
1 parent 9cab997 commit 0c0e588

File tree

4 files changed

+11
-59
lines changed

4 files changed

+11
-59
lines changed

‎L1Trigger/L1TGlobal/interface/GlobalBoard.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ namespace l1t {
7777
void receiveMuonObjectData(const edm::Event&,
7878
const edm::EDGetTokenT<BXVector<l1t::Muon>>&,
7979
const bool receiveMu,
80-
const int nrL1Mu,
81-
const std::vector<l1t::Muon>* muonVec_bxm2,
82-
const std::vector<l1t::Muon>* muonVec_bxm1);
80+
const int nrL1Mu);
8381

8482
void receiveMuonShowerObjectData(const edm::Event&,
8583
const edm::EDGetTokenT<BXVector<l1t::MuonShower>>&,

‎L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,6 @@ L1TGlobalProducer::L1TGlobalProducer(const edm::ParameterSet& parSet)
255255
m_l1GtTmAlgoCacheID = 0ULL;
256256
m_l1GtTmVetoAlgoCacheID = 0ULL;
257257

258-
//
259-
std::vector<l1t::Muon> muonVec_bxm2;
260-
std::vector<l1t::Muon> muonVec_bxm1;
261-
262258
// Set default, initial, dummy prescale factor table
263259
std::vector<std::vector<double>> temp_prescaleTable;
264260

@@ -601,7 +597,7 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
601597
receiveEtSumsZdc,
602598
receiveCICADA);
603599

604-
m_uGtBrd->receiveMuonObjectData(iEvent, m_muInputToken, receiveMu, m_nrL1Mu, &muonVec_bxm2, &muonVec_bxm1);
600+
m_uGtBrd->receiveMuonObjectData(iEvent, m_muInputToken, receiveMu, m_nrL1Mu);
605601

606602
if (m_useMuonShowers)
607603
m_uGtBrd->receiveMuonShowerObjectData(iEvent, m_muShowerInputToken, receiveMuShower, m_nrL1MuShower);
@@ -655,13 +651,6 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
655651

656652
} //End Loop over Bx
657653

658-
muonVec_bxm2 = muonVec_bxm1;
659-
muonVec_bxm1.clear();
660-
for (std::vector<const l1t::Muon*>::const_iterator iMu = (*(m_uGtBrd->getCandL1Mu())).begin(0);
661-
iMu != (*(m_uGtBrd->getCandL1Mu())).end(0);
662-
++iMu) {
663-
muonVec_bxm1.push_back(**iMu);
664-
}
665654
// Add explicit reset of Board
666655
m_uGtBrd->reset();
667656

‎L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,6 @@ class L1TGlobalProducer : public edm::stream::EDProducer<> {
196196

197197
//switch to save axo scores in global board
198198
bool m_produceAXOL1TLScore;
199-
200-
//vectors to store muon data for previous relative bx crossings
201-
std::vector<l1t::Muon> muonVec_bxm2;
202-
std::vector<l1t::Muon> muonVec_bxm1;
203199
};
204200

205201
#endif // L1TGlobalProducer_h

‎L1Trigger/L1TGlobal/src/GlobalBoard.cc‎

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,
366366
void l1t::GlobalBoard::receiveMuonObjectData(const edm::Event& iEvent,
367367
const edm::EDGetTokenT<BXVector<l1t::Muon>>& muInputToken,
368368
const bool receiveMu,
369-
const int nrL1Mu,
370-
const std::vector<l1t::Muon>* muonVec_bxm2,
371-
const std::vector<l1t::Muon>* muonVec_bxm1) {
369+
const int nrL1Mu) {
372370
if (m_verbosity) {
373371
LogDebug("L1TGlobal") << "\n**** GlobalBoard receiving muon data = ";
374372
//<< "\n from input tag " << muInputTag << "\n"
@@ -395,45 +393,16 @@ void l1t::GlobalBoard::receiveMuonObjectData(const edm::Event& iEvent,
395393

396394
//Loop over Muons in this bx
397395
int nObj = 0;
398-
if (i == -2) {
399-
for (std::vector<l1t::Muon>::const_iterator mu = muonVec_bxm2->begin(); mu != muonVec_bxm2->end(); ++mu) {
400-
if (nObj < nrL1Mu) {
401-
(*m_candL1Mu).push_back(i, &(*mu));
402-
} else {
403-
edm::LogWarning("L1TGlobal")
404-
<< " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
405-
}
406-
407-
LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
408-
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
409-
nObj++;
410-
}
411-
} else if (i == -1) {
412-
for (std::vector<l1t::Muon>::const_iterator mu = muonVec_bxm1->begin(); mu != muonVec_bxm1->end(); ++mu) {
413-
if (nObj < nrL1Mu) {
414-
(*m_candL1Mu).push_back(i, &(*mu));
415-
} else {
416-
edm::LogWarning("L1TGlobal")
417-
<< " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
418-
}
419-
420-
LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
421-
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
422-
nObj++;
396+
for (std::vector<l1t::Muon>::const_iterator mu = muonData->begin(i); mu != muonData->end(i); ++mu) {
397+
if (nObj < nrL1Mu) {
398+
(*m_candL1Mu).push_back(i, &(*mu));
399+
} else {
400+
edm::LogWarning("L1TGlobal") << " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
423401
}
424-
} else {
425-
for (std::vector<l1t::Muon>::const_iterator mu = muonData->begin(i); mu != muonData->end(i); ++mu) {
426-
if (nObj < nrL1Mu) {
427-
(*m_candL1Mu).push_back(i, &(*mu));
428-
} else {
429-
edm::LogWarning("L1TGlobal")
430-
<< " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
431-
}
432402

433-
LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
434-
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
435-
nObj++;
436-
}
403+
LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
404+
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
405+
nObj++;
437406
} //end loop over muons in bx
438407
} //end loop over bx
439408
} //end if over valid muon data

0 commit comments

Comments
 (0)