Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert #46026 (L1-uGT emulator) [14_2_X] #47089

Open
wants to merge 1 commit into
base: CMSSW_14_2_X
Choose a base branch
from
+11 −59
Open

revert #46026 (L1-uGT emulator) [14_2_X] #47089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions L1Trigger/L1TGlobal/interface/GlobalBoard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ namespace l1t {
void receiveMuonObjectData(const edm::Event&,
const edm::EDGetTokenT<BXVector<l1t::Muon>>&,
const bool receiveMu,
const int nrL1Mu,
const std::vector<l1t::Muon>* muonVec_bxm2,
const std::vector<l1t::Muon>* muonVec_bxm1);
const int nrL1Mu);

void receiveMuonShowerObjectData(const edm::Event&,
const edm::EDGetTokenT<BXVector<l1t::MuonShower>>&,
Expand Down
13 changes: 1 addition & 12 deletions L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,6 @@ L1TGlobalProducer::L1TGlobalProducer(const edm::ParameterSet& parSet)

m_currentLumi = 0;

//
std::vector<l1t::Muon> muonVec_bxm2;
std::vector<l1t::Muon> muonVec_bxm1;

// Set default, initial, dummy prescale factor table
std::vector<std::vector<double>> temp_prescaleTable;

Expand Down Expand Up @@ -645,7 +641,7 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
receiveEtSumsZdc,
receiveCICADA);

m_uGtBrd->receiveMuonObjectData(iEvent, m_muInputToken, receiveMu, m_nrL1Mu, &muonVec_bxm2, &muonVec_bxm1);
m_uGtBrd->receiveMuonObjectData(iEvent, m_muInputToken, receiveMu, m_nrL1Mu);

if (m_useMuonShowers)
m_uGtBrd->receiveMuonShowerObjectData(iEvent, m_muShowerInputToken, receiveMuShower, m_nrL1MuShower);
Expand Down Expand Up @@ -704,13 +700,6 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet

} //End Loop over Bx

muonVec_bxm2 = muonVec_bxm1;
muonVec_bxm1.clear();
for (std::vector<const l1t::Muon*>::const_iterator iMu = (*(m_uGtBrd->getCandL1Mu())).begin(0);
iMu != (*(m_uGtBrd->getCandL1Mu())).end(0);
++iMu) {
muonVec_bxm1.push_back(**iMu);
}
// Add explicit reset of Board
m_uGtBrd->reset();

Expand Down
4 changes: 0 additions & 4 deletions L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,6 @@ class L1TGlobalProducer : public edm::stream::EDProducer<> {

//switch to save axo scores in global board
bool m_produceAXOL1TLScore;

//vectors to store muon data for previous relative bx crossings
std::vector<l1t::Muon> muonVec_bxm2;
std::vector<l1t::Muon> muonVec_bxm1;
};

#endif // L1TGlobalProducer_h
49 changes: 9 additions & 40 deletions L1Trigger/L1TGlobal/src/GlobalBoard.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,7 @@ void l1t::GlobalBoard::receiveCaloObjectData(const edm::Event& iEvent,
void l1t::GlobalBoard::receiveMuonObjectData(const edm::Event& iEvent,
const edm::EDGetTokenT<BXVector<l1t::Muon>>& muInputToken,
const bool receiveMu,
const int nrL1Mu,
const std::vector<l1t::Muon>* muonVec_bxm2,
const std::vector<l1t::Muon>* muonVec_bxm1) {
const int nrL1Mu) {
if (m_verbosity) {
LogDebug("L1TGlobal") << "\n**** GlobalBoard receiving muon data = ";
//<< "\n from input tag " << muInputTag << "\n"
Expand All @@ -405,45 +403,16 @@ void l1t::GlobalBoard::receiveMuonObjectData(const edm::Event& iEvent,

//Loop over Muons in this bx
int nObj = 0;
if (i == -2) {
for (std::vector<l1t::Muon>::const_iterator mu = muonVec_bxm2->begin(); mu != muonVec_bxm2->end(); ++mu) {
if (nObj < nrL1Mu) {
(*m_candL1Mu).push_back(i, &(*mu));
} else {
edm::LogWarning("L1TGlobal")
<< " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
}

LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
nObj++;
}
} else if (i == -1) {
for (std::vector<l1t::Muon>::const_iterator mu = muonVec_bxm1->begin(); mu != muonVec_bxm1->end(); ++mu) {
if (nObj < nrL1Mu) {
(*m_candL1Mu).push_back(i, &(*mu));
} else {
edm::LogWarning("L1TGlobal")
<< " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
}

LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
nObj++;
for (std::vector<l1t::Muon>::const_iterator mu = muonData->begin(i); mu != muonData->end(i); ++mu) {
if (nObj < nrL1Mu) {
(*m_candL1Mu).push_back(i, &(*mu));
} else {
edm::LogWarning("L1TGlobal") << " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
}
} else {
for (std::vector<l1t::Muon>::const_iterator mu = muonData->begin(i); mu != muonData->end(i); ++mu) {
if (nObj < nrL1Mu) {
(*m_candL1Mu).push_back(i, &(*mu));
} else {
edm::LogWarning("L1TGlobal")
<< " Too many Muons (" << nObj << ") for uGT Configuration maxMu =" << nrL1Mu;
}

LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
nObj++;
}
LogDebug("L1TGlobal") << "Muon Pt " << mu->hwPt() << " EtaAtVtx " << mu->hwEtaAtVtx() << " PhiAtVtx "
<< mu->hwPhiAtVtx() << " Qual " << mu->hwQual() << " Iso " << mu->hwIso();
nObj++;
} //end loop over muons in bx
} //end loop over bx
} //end if over valid muon data
Expand Down