Cleaning up AXO model from L1Global

artlbv · Mar 22, 2024 · b3970a8 · b3970a8
1 parent ccb11e8
commit b3970a8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/L1Trigger/L1TGlobal/interface/GlobalBoard.h b/L1Trigger/L1TGlobal/interface/GlobalBoard.h
@@ -204,8 +204,6 @@ namespace l1t {
     void setResetPSCountersEachLumiSec(bool val) { m_resetPSCountersEachLumiSec = val; }
     void setSemiRandomInitialPSCounters(bool val) { m_semiRandomInitialPSCounters = val; }
 
-    void setAXOL1TLModelVersion(std::string axol1tlModelVersion);
-
   public:
     inline void setVerbosity(const int verbosity) { m_verbosity = verbosity; }
 

diff --git a/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.cc b/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.cc
@@ -167,11 +167,6 @@ void l1t::TriggerMenuParser::setVecCorrelationWithOverlapRemovalTemplate(
   m_vecCorrelationWithOverlapRemovalTemplate = vecCorrelationWithOverlapRemovalTempl;
 }
 
-//set the AXO model version so it can be fetched from the GlobalProducer
-void l1t::TriggerMenuParser::setAXOL1TLModelVersion(const std::string& axol1tlmodelversion) {
-  m_axol1tlModelVersion = axol1tlmodelversion;
-}
-
 // set the vectors containing the conditions for correlation templates
 //
 void l1t::TriggerMenuParser::setCorMuonTemplate(const std::vector<std::vector<MuonTemplate> >& corMuonTempl) {
@@ -2825,9 +2820,6 @@ bool l1t::TriggerMenuParser::parseAXOL1TL(L1TUtmCondition condAXOL1TL, unsigned
 
   (m_vecAXOL1TLTemplate[chipNr]).push_back(axol1tlCond);
 
-  //fill class model version variable
-  l1t::TriggerMenuParser::setAXOL1TLModelVersion(model);
-
   return true;
 }
 

diff --git a/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.h b/L1Trigger/L1TGlobal/plugins/TriggerMenuParser.h
@@ -187,11 +187,6 @@ namespace l1t {
     void setVecCorrelationWithOverlapRemovalTemplate(
         const std::vector<std::vector<CorrelationWithOverlapRemovalTemplate> >&);
 
-    // get/set the AXO model version so it can be fetched from the GlobalProducer
-    inline const std::string& AXOL1TLModelVersion() const { return m_axol1tlModelVersion; }
-
-    void setAXOL1TLModelVersion(const std::string&);
-
     // get / set the vectors containing the conditions for correlation templates
     //
     inline const std::vector<std::vector<MuonTemplate> >& corMuonTemplate() const { return m_corMuonTemplate; }

diff --git a/L1Trigger/L1TGlobal/src/AXOL1TLCondition.cc b/L1Trigger/L1TGlobal/src/AXOL1TLCondition.cc
@@ -90,7 +90,6 @@ const bool l1t::AXOL1TLCondition::evaluateCondition(const int bxEval) const {
   int useBx = bxEval + m_gtAXOL1TLTemplate->condRelativeBx();
 
   //HLS4ML stuff
-  // std::string AXOL1TLmodelversion = m_AXOL1TLmodelversion;  //loading from menu
   std::string AXOL1TLmodelversion = "GTADModel_" + m_gtAXOL1TLTemplate->modelVersion();  //loading from menu/template
 
   //if model version is empty, throw exception. Should not ever happen
@@ -107,8 +106,8 @@ const bool l1t::AXOL1TLCondition::evaluateCondition(const int bxEval) const {
   } catch (std::runtime_error& e) {
     // for stopping with exception if model version cannot be loaded
     throw cms::Exception("ModelError")
-        << " ERROR: failed to load AXOL1TL model version " << AXOL1TLmodelversion
-        << " that was specified in menu. Model version not found in cms-hls4ml externals. " << std::endl;
+        << " ERROR: failed to load AXOL1TL model version \"" << AXOL1TLmodelversion
+        << "\" that was specified in menu. Model version not found in cms-hls4ml externals.";
   }
 
   // //pointers to objects