diff --git a/DataFormats/HLTReco/interface/TriggerTypeDefs.h b/DataFormats/HLTReco/interface/TriggerTypeDefs.h index 8d45088ddebab..9305132120a88 100644 --- a/DataFormats/HLTReco/interface/TriggerTypeDefs.h +++ b/DataFormats/HLTReco/interface/TriggerTypeDefs.h @@ -24,7 +24,7 @@ namespace trigger { /// enum start value shifted to 81 so as to avoid clashes with PDG codes - /// L1 - using cases as defined in enum L1GtObject, file: + /// L1 - using cases as defined in enum L1GtObject, legacy and stage 1 file: /// DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h" TriggerL1Mu = -81, @@ -72,11 +72,13 @@ namespace trigger { TriggerL1PFMHT = -122, TriggerL1PFTrack = -123, TriggerL1Vertex = -124, - // Phase-1: MuonShower - TriggerL1MuShower = -125, // stage2 (introduced in Run 3) - // Phase-1: ZDC+ and ZDC- - TriggerL1ZDCP = -126, // stage2 (introduced in 2023 during Run 3) - TriggerL1ZDCM = -127, // stage2 (introduced in 2023 during Run 3) + // Phase-1: MuonShower triggers (Run 3 - 2022) + TriggerL1MuShower = -125, // stage2 + // Phase-1: ZDC+ and ZDC- triggers for HI (Run 3 - 2023) + TriggerL1ZDCP = -126, // stage2 + TriggerL1ZDCM = -127, // stage2 + // Phase-1: MHTHF triggers + TriggerL1HTMHF = -128, // stage2 /// HLT TriggerPhoton = +81, diff --git a/DataFormats/L1TGlobal/interface/GlobalObject.h b/DataFormats/L1TGlobal/interface/GlobalObject.h index b6819b61b7296..f7491e99c2a07 100644 --- a/DataFormats/L1TGlobal/interface/GlobalObject.h +++ b/DataFormats/L1TGlobal/interface/GlobalObject.h @@ -60,6 +60,7 @@ namespace l1t { gtZDCP = 29, gtZDCM = 30, ObjNull = 31, + gtHTMHF = 32, }; const std::vector> kGlobalObjectEnumStringPairs = { @@ -95,6 +96,7 @@ namespace l1t { {gtZDCP, "ZDCP"}, // 29 {gtZDCM, "ZDCM"}, // 30 {ObjNull, "ObjNull"}, // 31 + {gtHTMHF, "HTMHF"}, // 32 }; // utility functions to convert GlobalObject enum to std::string and viceversa diff --git a/DataFormats/L1TGlobal/test/test_catch2_l1tGlobalObject.cc b/DataFormats/L1TGlobal/test/test_catch2_l1tGlobalObject.cc index 2ab1135798624..57c94a6321c1c 100644 --- a/DataFormats/L1TGlobal/test/test_catch2_l1tGlobalObject.cc +++ b/DataFormats/L1TGlobal/test/test_catch2_l1tGlobalObject.cc @@ -100,5 +100,6 @@ TEST_CASE("Test l1t::GlobalObject", "[l1tGlobalObject]") { REQUIRE(isValidGlobalObject(29, l1t::gtZDCP, "ZDCP")); // 29 REQUIRE(isValidGlobalObject(30, l1t::gtZDCM, "ZDCM")); // 30 REQUIRE(isValidGlobalObject(31, l1t::ObjNull, "ObjNull")); // 31 + REQUIRE(isValidGlobalObject(32, l1t::gtHTMHF, "HTMHF")); // 32 } } diff --git a/HLTrigger/HLTfilters/plugins/HLTL1TSeed.cc b/HLTrigger/HLTfilters/plugins/HLTL1TSeed.cc index ac3641adbe5bf..3c5a1930ed059 100644 --- a/HLTrigger/HLTfilters/plugins/HLTL1TSeed.cc +++ b/HLTrigger/HLTfilters/plugins/HLTL1TSeed.cc @@ -304,6 +304,21 @@ void HLTL1TSeed::dumpTriggerFilterObjectWithRefs(trigger::TriggerFilterObjectWit << "phi = " << obj->phi(); //<< "\t" << "BX = " << obj->bx(); } + vector seedsL1EtSumHTMHF; + filterproduct.getObjects(trigger::TriggerL1HTMHF, seedsL1EtSumHTMHF); + const size_t sizeSeedsL1EtSumHTMHF = seedsL1EtSumHTMHF.size(); + LogTrace("HLTL1TSeed") << "\n L1EtSum HTMHF seeds: " << sizeSeedsL1EtSumHTMHF << endl << endl; + + for (size_t i = 0; i != sizeSeedsL1EtSumHTMHF; i++) { + l1t::EtSumRef obj = l1t::EtSumRef(seedsL1EtSumHTMHF[i]); + + LogTrace("HLTL1TSeed") << "\tL1EtSum HTMHF" + << "\t" + << "pt = " << obj->pt() << "\t" + << "eta = " << obj->eta() << "\t" + << "phi = " << obj->phi(); //<< "\t" << "BX = " << obj->bx(); + } + vector seedsL1EtSumHTM; filterproduct.getObjects(trigger::TriggerL1HTM, seedsL1EtSumHTM); const size_t sizeSeedsL1EtSumHTM = seedsL1EtSumHTM.size(); @@ -485,6 +500,7 @@ bool HLTL1TSeed::seedsL1TriggerObjectMaps(edm::Event& iEvent, trigger::TriggerFi std::list listHTT; std::list listHTM; std::list listETMHF; + std::list listHTMHF; std::list listJetCounts; @@ -789,6 +805,9 @@ bool HLTL1TSeed::seedsL1TriggerObjectMaps(edm::Event& iEvent, trigger::TriggerFi case l1t::gtETMHF: { listETMHF.push_back(*itObject); } break; + case l1t::gtHTMHF: { + listHTMHF.push_back(*itObject); + } break; case l1t::gtTowerCount: { listTowerCount.push_back(*itObject); } break; @@ -891,6 +910,9 @@ bool HLTL1TSeed::seedsL1TriggerObjectMaps(edm::Event& iEvent, trigger::TriggerFi listETMHF.sort(); listETMHF.unique(); + listHTMHF.sort(); + listHTMHF.unique(); + listJetCounts.sort(); listJetCounts.unique(); @@ -1112,6 +1134,10 @@ bool HLTL1TSeed::seedsL1TriggerObjectMaps(edm::Event& iEvent, trigger::TriggerFi if (!listETMHF.empty()) filterproduct.addObject(trigger::TriggerL1ETMHF, myref); break; + case l1t::EtSum::kMissingHtHF: + if (!listHTMHF.empty()) + filterproduct.addObject(trigger::TriggerL1HTMHF, myref); + break; case l1t::EtSum::kCentrality: if (!listCentrality.empty()) filterproduct.addObject(trigger::TriggerL1Centrality, myref); diff --git a/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h b/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h index 8162cf921af32..5d94ad35ab282 100644 --- a/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h +++ b/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h @@ -44,7 +44,7 @@ namespace l1t { /// Type2cor : two particles, different type, with spatial correlations among them /// Type3s : three particles, same type /// Type4s : four particles, same type - /// TypeETM, TypeETT, TypeHTT, TypeHTM : ETM, ETT, HTT, HTM + /// TypeETM, TypeETT, TypeHTT, TypeHTM, TypeETMHF, TypeHTMHF: ETM, ETT, HTT, HTM, ETMHF, HTMHF /// TypeExternal: external conditions (logical result only; definition in L1 GT external systems) enum GtConditionType { TypeNull, @@ -59,6 +59,7 @@ namespace l1t { TypeHTT, TypeHTM, TypeETMHF, + TypeHTMHF, TypeTowerCount, TypeMinBiasHFP0, TypeMinBiasHFM0, diff --git a/L1Trigger/L1TGlobal/interface/GlobalScales.h b/L1Trigger/L1TGlobal/interface/GlobalScales.h index 151a7d644c84f..2500f7ca682a6 100644 --- a/L1Trigger/L1TGlobal/interface/GlobalScales.h +++ b/L1Trigger/L1TGlobal/interface/GlobalScales.h @@ -66,6 +66,7 @@ namespace l1t { inline void setHTTScales(ScaleParameters& scales) { m_httScales = scales; } inline void setETMScales(ScaleParameters& scales) { m_etmScales = scales; } inline void setETMHfScales(ScaleParameters& scales) { m_etmHfScales = scales; } + inline void setHTMHfScales(ScaleParameters& scales) { m_htmHfScales = scales; } inline void setHTMScales(ScaleParameters& scales) { m_htmScales = scales; } virtual void setLUT_CalMuEta(const std::string& lutName, std::vector lut); @@ -91,6 +92,7 @@ namespace l1t { inline const ScaleParameters& getETTEmScales() const { return m_ettEmScales; } inline const ScaleParameters& getETMScales() const { return m_etmScales; } inline const ScaleParameters& getETMHFScales() const { return m_etmHfScales; } + inline const ScaleParameters& getHTMHFScales() const { return m_htmHfScales; } inline const ScaleParameters& getHTTScales() const { return m_httScales; } inline const ScaleParameters& getHTMScales() const { return m_htmScales; } @@ -134,6 +136,7 @@ namespace l1t { ScaleParameters m_httScales; ScaleParameters m_etmScales; ScaleParameters m_etmHfScales; + ScaleParameters m_htmHfScales; ScaleParameters m_htmScales; //LUTs diff --git a/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc b/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc index 0505f43ecb0bc..eb471bb54b904 100644 --- a/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc +++ b/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc @@ -544,7 +544,8 @@ namespace l1t { << std::setfill('0') << etsum->hwPt() << ")"; if (etsum->getType() == l1t::EtSum::EtSumType::kMissingEt || etsum->getType() == l1t::EtSum::EtSumType::kMissingHt || - etsum->getType() == l1t::EtSum::EtSumType::kMissingEtHF) + etsum->getType() == l1t::EtSum::EtSumType::kMissingEtHF || + etsum->getType() == l1t::EtSum::EtSumType::kMissingHtHF) cout << " Phi " << std::dec << std::setw(3) << etsum->hwPhi() << " (0x" << std::hex << std::setw(2) << std::setfill('0') << etsum->hwPhi() << ")"; cout << endl; diff --git a/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.cc b/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.cc index 81fb9afa080e2..eeaa9b274ebf4 100644 --- a/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.cc +++ b/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.cc @@ -26,6 +26,8 @@ * - extended for Zero Degree Calorimeter triggers (used for Run 3 HI data-taking) * \new features: Melissa Quinnan, Elisa Fontanesi * - extended for AXOL1TL anomaly detection triggers (used for Run 3 data-taking) + * \new features: Elisa Fontanesi + * - extended for HTMHF triggers (introduced for the Run 3 2024 data-taking) * * $Date$ * $Revision$ @@ -297,6 +299,7 @@ void l1t::TriggerMenuParser::parseCondFormats(const L1TUtmTriggerMenu* utmMenu) condition.getType() == esConditionType::MissingEt || condition.getType() == esConditionType::MissingHt || condition.getType() == esConditionType::MissingEtHF || + condition.getType() == esConditionType::MissingHtHF || condition.getType() == esConditionType::TowerCount || condition.getType() == esConditionType::MinBiasHFP0 || condition.getType() == esConditionType::MinBiasHFM0 || @@ -578,6 +581,7 @@ bool l1t::TriggerMenuParser::parseScales(std::mapetaMin = -1.; scaleParam->etaMax = -1.; scaleParam->etaStep = -1.; @@ -702,6 +709,7 @@ bool l1t::TriggerMenuParser::parseScales(std::mapgetType() == esObjectType::ETMHF) { energySumObjType = GlobalObject::gtETMHF; cType = TypeETMHF; + } else if (corrESum->getType() == esObjectType::HTMHF) { + energySumObjType = GlobalObject::gtHTMHF; + cType = TypeHTMHF; } else if (corrESum->getType() == esObjectType::TOWERCOUNT) { energySumObjType = GlobalObject::gtTowerCount; cType = TypeTowerCount; @@ -3128,7 +3153,8 @@ bool l1t::TriggerMenuParser::parseCorrelation(L1TUtmCondition corrCond, unsigned condCateg[jj] = CondCalo; } else if (object.getType() == esObjectType::ETM || object.getType() == esObjectType::ETMHF || - object.getType() == esObjectType::TOWERCOUNT || object.getType() == esObjectType::HTM) { + object.getType() == esObjectType::HTMHF || object.getType() == esObjectType::TOWERCOUNT || + object.getType() == esObjectType::HTM) { // we have Energy Sum parseEnergySumCorr(&object, chipNr); corrIndexVal[jj] = (m_corEnergySumTemplate[chipNr]).size() - 1; @@ -3145,6 +3171,9 @@ bool l1t::TriggerMenuParser::parseCorrelation(L1TUtmCondition corrCond, unsigned case esObjectType::ETMHF: { objType[jj] = GlobalObject::gtETMHF; } break; + case esObjectType::HTMHF: { + objType[jj] = GlobalObject::gtHTMHF; + } break; case esObjectType::TOWERCOUNT: { objType[jj] = GlobalObject::gtTowerCount; } break; @@ -3581,7 +3610,8 @@ bool l1t::TriggerMenuParser::parseCorrelationWithOverlapRemoval(const L1TUtmCond condCateg[jj] = CondCalo; } else if (object.getType() == esObjectType::ETM || object.getType() == esObjectType::ETMHF || - object.getType() == esObjectType::TOWERCOUNT || object.getType() == esObjectType::HTM) { + object.getType() == esObjectType::HTMHF || object.getType() == esObjectType::TOWERCOUNT || + object.getType() == esObjectType::HTM) { // we have Energy Sum parseEnergySumCorr(&object, chipNr); corrIndexVal[jj] = (m_corEnergySumTemplate[chipNr]).size() - 1; @@ -3598,6 +3628,9 @@ bool l1t::TriggerMenuParser::parseCorrelationWithOverlapRemoval(const L1TUtmCond case esObjectType::ETMHF: { objType[jj] = GlobalObject::gtETMHF; } break; + case esObjectType::HTMHF: { + objType[jj] = GlobalObject::gtHTMHF; + } break; case esObjectType::TOWERCOUNT: { objType[jj] = GlobalObject::gtTowerCount; } break; diff --git a/L1Trigger/L1TGlobal/src/CorrCondition.cc b/L1Trigger/L1TGlobal/src/CorrCondition.cc index fc214afe2ada2..207464fae395d 100644 --- a/L1Trigger/L1TGlobal/src/CorrCondition.cc +++ b/L1Trigger/L1TGlobal/src/CorrCondition.cc @@ -577,6 +577,10 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const { type = l1t::EtSum::EtSumType::kMissingEtHF; lutObj0 = "ETMHF"; break; + case gtHTMHF: + type = l1t::EtSum::EtSumType::kMissingHtHF; + lutObj0 = "HTMHF"; + break; case gtMinBiasHFP0: case gtMinBiasHFM0: case gtMinBiasHFP1: @@ -644,6 +648,20 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const { binEdges = m_gtScales->getETMHFScales().etBins.at(etBin0); et0Phy = 0.5 * (binEdges.second + binEdges.first); + } else if (cndObjTypeVec[0] == gtHTMHF) { + std::pair binEdges = m_gtScales->getHTMHFScales().phiBins.at(phiIndex0); + phi0Phy = 0.5 * (binEdges.second + binEdges.first); + eta0Phy = 0.; //No Eta for Energy Sums + + etBin0 = etIndex0; + int ssize = m_gtScales->getHTMHFScales().etBins.size(); + assert(ssize > 0); + if (etBin0 >= ssize) { + etBin0 = ssize - 1; + } + + binEdges = m_gtScales->getHTMHFScales().etBins.at(etBin0); + et0Phy = 0.5 * (binEdges.second + binEdges.first); } //If needed convert calo scales to muon scales for comparison (only phi for energy sums) @@ -854,6 +872,10 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const { type = l1t::EtSum::EtSumType::kMissingEtHF; lutObj1 = "ETMHF"; break; + case gtHTMHF: + type = l1t::EtSum::EtSumType::kMissingHtHF; + lutObj1 = "HTMHF"; + break; case gtMinBiasHFP0: case gtMinBiasHFM0: case gtMinBiasHFP1: @@ -922,6 +944,20 @@ const bool l1t::CorrCondition::evaluateCondition(const int bxEval) const { binEdges = m_gtScales->getETMHFScales().etBins.at(etBin1); et1Phy = 0.5 * (binEdges.second + binEdges.first); + } else if (cndObjTypeVec[1] == gtHTMHF) { + std::pair binEdges = m_gtScales->getHTMHFScales().phiBins.at(phiIndex1); + phi1Phy = 0.5 * (binEdges.second + binEdges.first); + eta1Phy = 0.; //No Eta for Energy Sums + + etBin1 = etIndex1; + int ssize = m_gtScales->getHTMHFScales().etBins.size(); + assert(ssize > 0); + if (etBin1 >= ssize) { + etBin1 = ssize - 1; + } + + binEdges = m_gtScales->getHTMHFScales().etBins.at(etBin1); + et1Phy = 0.5 * (binEdges.second + binEdges.first); } //If needed convert calo scales to muon scales for comparison (only phi for energy sums) diff --git a/L1Trigger/L1TGlobal/src/EnergySumCondition.cc b/L1Trigger/L1TGlobal/src/EnergySumCondition.cc index 2e45dd1985f81..8ab5561ed1296 100644 --- a/L1Trigger/L1TGlobal/src/EnergySumCondition.cc +++ b/L1Trigger/L1TGlobal/src/EnergySumCondition.cc @@ -147,6 +147,10 @@ const bool l1t::EnergySumCondition::evaluateCondition(const int bxEval) const { type = l1t::EtSum::EtSumType::kMissingEtHF; MissingEnergy = true; break; + case gtHTMHF: + type = l1t::EtSum::EtSumType::kMissingHtHF; + MissingEnergy = true; + break; case gtTowerCount: type = l1t::EtSum::EtSumType::kTowerCount; MissingEnergy = false; diff --git a/L1Trigger/L1TGlobal/src/EnergySumTemplate.cc b/L1Trigger/L1TGlobal/src/EnergySumTemplate.cc index 4d99232771b74..157135555bed0 100644 --- a/L1Trigger/L1TGlobal/src/EnergySumTemplate.cc +++ b/L1Trigger/L1TGlobal/src/EnergySumTemplate.cc @@ -88,6 +88,8 @@ void EnergySumTemplate::print(std::ostream& myCout) const { myCout << " phi = " << std::hex << m_objectParameter[i].phiRange0Word << std::endl; } else if (m_condType == l1t::TypeETMHF) { myCout << " phi = " << std::hex << m_objectParameter[i].phiRange0Word << std::endl; + } else if (m_condType == l1t::TypeHTMHF) { + myCout << " phi = " << std::hex << m_objectParameter[i].phiRange0Word << std::endl; } } diff --git a/L1Trigger/L1TGlobal/src/GlobalCondition.cc b/L1Trigger/L1TGlobal/src/GlobalCondition.cc index 2765101c60d40..3ed7572466101 100644 --- a/L1Trigger/L1TGlobal/src/GlobalCondition.cc +++ b/L1Trigger/L1TGlobal/src/GlobalCondition.cc @@ -113,6 +113,7 @@ const int GlobalCondition::nrObjects() const { case l1t::TypeHTT: case l1t::TypeHTM: case l1t::TypeETMHF: + case l1t::TypeHTMHF: case l1t::TypeTowerCount: case l1t::TypeMinBiasHFP0: case l1t::TypeMinBiasHFM0: @@ -323,6 +324,12 @@ void GlobalCondition::print(std::ostream& myCout) const { << "TypeETMHF" << std::endl; } + break; + case l1t::TypeHTMHF: { + myCout << " Condition type: " + << "TypeHTMHF" << std::endl; + } + break; case l1t::TypeTowerCount: { myCout << " Condition type: " @@ -500,6 +507,11 @@ void GlobalCondition::print(std::ostream& myCout) const { myCout << " ETMHF "; } + break; + case l1t::gtHTMHF: { + myCout << " HTMHF "; + } + break; case l1t::gtTowerCount: { myCout << " TowerCount "; diff --git a/L1Trigger/L1TGlobal/src/GlobalDefinitions.cc b/L1Trigger/L1TGlobal/src/GlobalDefinitions.cc index 64ff03b9fff8c..96f41b33e8f82 100644 --- a/L1Trigger/L1TGlobal/src/GlobalDefinitions.cc +++ b/L1Trigger/L1TGlobal/src/GlobalDefinitions.cc @@ -62,6 +62,7 @@ namespace { {"l1t::TypeHTT", l1t::TypeHTT}, {"l1t::TypeHTM", l1t::TypeHTM}, {"l1t::TypeETMHF", l1t::TypeETMHF}, + {"l1t::TypeHTMHF", l1t::TypeHTMHF}, {"l1t::TypeTowerCount", l1t::TypeTowerCount}, {"l1t::TypeMinBiasHFP0", l1t::TypeMinBiasHFP0}, {"l1t::TypeMinBiasHFM0", l1t::TypeMinBiasHFM0}, diff --git a/L1Trigger/L1TGlobal/test/testVectorCode_data.py b/L1Trigger/L1TGlobal/test/testVectorCode_data.py index fa39ac7050b6f..185194a4de84a 100644 --- a/L1Trigger/L1TGlobal/test/testVectorCode_data.py +++ b/L1Trigger/L1TGlobal/test/testVectorCode_data.py @@ -89,10 +89,14 @@ process.source = cms.Source("PoolSource", secondaryFileNames = cms.untracked.vstring(), fileNames = cms.untracked.vstring( - "/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/8daa24c0-6005-41a8-a4f1-bd75b5bdf7a2.root", - "/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/cbe27e9e-1471-4eda-b011-5b56739f88bd.root", - "/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/03978c75-76b5-4334-aa88-9fb938f2540e.root", - "/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/e822a72d-988a-4cb0-9e40-f7b90fdeb6fc.root", + "/store/data/Run2024E/EphemeralHLTPhysics0/RAW/v1/000/381/065/00000/0041494e-c2c5-4008-a687-5a856740b2f9.root", + "/store/data/Run2024E/EphemeralHLTPhysics0/RAW/v1/000/381/065/00000/00dc1cfe-994b-4e7a-9ea5-7883435a95e2.root", + "/store/data/Run2024E/EphemeralHLTPhysics0/RAW/v1/000/381/065/00000/007244f0-fbac-480a-a8b4-d7d6fd31b01f.root", + "/store/data/Run2024E/EphemeralHLTPhysics0/RAW/v1/000/381/065/00000/033842c3-61c6-43af-8e9f-d698bfd10282.root", + #"/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/8daa24c0-6005-41a8-a4f1-bd75b5bdf7a2.root", + #"/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/cbe27e9e-1471-4eda-b011-5b56739f88bd.root", + #"/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/03978c75-76b5-4334-aa88-9fb938f2540e.root", + #"/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/369/870/00000/e822a72d-988a-4cb0-9e40-f7b90fdeb6fc.root", ), skipEvents = cms.untracked.uint32(skip) ) @@ -123,7 +127,7 @@ # ---------------- process.load('L1Trigger.L1TGlobal.GlobalParameters_cff') process.load("L1Trigger.L1TGlobal.TriggerMenu_cff") -xmlMenu="L1Menu_Collisions2024_v1_1_0.xml" +xmlMenu="L1Menu_Collisions2024_v1_3_0.xml" process.TriggerMenu.L1TriggerMenuFile = cms.string(xmlMenu) process.ESPreferL1TXML = cms.ESPrefer("L1TUtmTriggerMenuESProducer","TriggerMenu") @@ -172,7 +176,7 @@ process.simGtStage2Digis.EGammaInputTag = cms.InputTag("gtStage2Digis", "EGamma") process.simGtStage2Digis.TauInputTag = cms.InputTag("gtStage2Digis", "Tau") process.simGtStage2Digis.JetInputTag = cms.InputTag("gtStage2Digis", "Jet") -process.simGtStage2Digis.EtSumInputTag = cms.InputTag("gtStage2Digis", "ETSum") +process.simGtStage2Digis.EtSumInputTag = cms.InputTag("gtStage2Digis", "EtSum") process.simGtStage2Digis.EtSumZdcInputTag = cms.InputTag("etSumZdcProducer") process.simGtStage2Digis.EmulateBxInEvent = cms.int32(1) @@ -182,7 +186,7 @@ muShowerInputTag = cms.InputTag("gtStage2Digis", "MuonShower"), tauInputTag = cms.InputTag("gtStage2Digis", "Tau"), jetInputTag = cms.InputTag("gtStage2Digis", "Jet"), - etsumInputTag = cms.InputTag("gtStage2Digis", "ETSum"), + etsumInputTag = cms.InputTag("gtStage2Digis", "EtSum"), uGtAlgInputTag = cms.InputTag("simGtStage2Digis"), uGtExtInputTag = cms.InputTag("simGtExtFakeProd"), uGtObjectMapInputTag = cms.InputTag("simGtStage2Digis"),