Remove Axo model setting from L1 Global

artlbv · Mar 22, 2024 · 3e82bc4 · 3e82bc4
1 parent 2c51218
commit 3e82bc4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.cc
@@ -220,7 +220,7 @@ L1TGlobalProducer::L1TGlobalProducer(const edm::ParameterSet& parSet)
   m_l1GtParCacheID = 0ULL;
   m_l1GtMenuCacheID = 0ULL;
 
-  m_AXOL1TLModelVersion = "";
+  // m_AXOL1TLModelVersion = "";
 
   m_numberPhysTriggers = 0;
   m_numberDaqPartitions = 0;
@@ -402,16 +402,6 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
 
     m_l1GtMenuCacheID = l1GtMenuCacheID;
 
-    //get model version to condition class via GlobalBoard.runGTL, comes from menu rather than config
-    //for throwing exception when using L1Menu_Collisions2024_v1_0_0
-    if ((gtParser.gtTriggerMenuName() == "L1Menu_Collisions2024_v1_0_0") ||
-        (gtParser.gtTriggerMenuName() == "L1Menu_Collisions2024_v0_0_0")) {
-      throw cms::Exception("ConditionsError")
-          << " Error L1T menu version " << gtParser.gtTriggerMenuName()
-          << " is unsupported due to incompatible utm grammar, please use L1Menu_Collisions2024_v1_0_1 or later";
-    } else {
-      m_AXOL1TLModelVersion = gtParser.AXOL1TLModelVersion();
-    }
   }
 
   // get / update the board maps from the EventSetup
@@ -635,7 +625,7 @@ void L1TGlobalProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSet
   m_uGtBrd->receiveMuonObjectData(iEvent, m_muInputToken, receiveMu, m_nrL1Mu);
 
   //set axo model version in global board from version in menu
-  m_uGtBrd->setAXOL1TLModelVersion(m_AXOL1TLModelVersion);
+  // m_uGtBrd->setAXOL1TLModelVersion(m_AXOL1TLModelVersion);
 
   if (m_useMuonShowers)
     m_uGtBrd->receiveMuonShowerObjectData(iEvent, m_muShowerInputToken, receiveMuShower, m_nrL1MuShower);

diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h b/L1Trigger/L1TGlobal/plugins/L1TGlobalProducer.h
@@ -195,9 +195,6 @@ class L1TGlobalProducer : public edm::stream::EDProducer<> {
   // if false, the prescale counters are initialised to zero
   bool m_semiRandomInitialPSCounters;
 
-  //string to store AXOL1TL model version
-  std::string m_AXOL1TLModelVersion;
-
   // switch to load muon showers in the global board
   bool m_useMuonShowers;
 };

diff --git a/L1Trigger/L1TGlobal/src/GlobalBoard.cc b/L1Trigger/L1TGlobal/src/GlobalBoard.cc
@@ -656,8 +656,6 @@ void l1t::GlobalBoard::runGTL(const edm::Event&,
 
           axol1tlCondition->setVerbosity(m_verbosity);
 
-          axol1tlCondition->setModelVersion(m_axol1tlModelVersion);
-
           axol1tlCondition->evaluateConditionStoreResult(iBxInEvent);
 
           cMapResults[itCond->first] = axol1tlCondition;