TrigGlobalEfficiencyAlg 2023+ data support

TrigGlobalEfficiencyAlg 2023+ data support

PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/Root/TrigGlobalEfficiencyAlg.cxx

@@ -21,7 +21,8 @@ CP::TrigGlobalEfficiencyAlg::TrigGlobalEfficiencyAlg(const std::string &name,
 StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
 {
 
-  if (m_trigList_2015.empty() && m_trigList_2016.empty() && m_trigList_2017.empty() && m_trigList_2018.empty() && m_trigList_2022.empty()) {
+  if (m_trigList_2015.empty() && m_trigList_2016.empty() && m_trigList_2017.empty() && m_trigList_2018.empty() 
+      && m_trigList_2022.empty() & m_trigList_2023.empty() & m_trigList_2024.empty() & m_trigList_2025.empty()) {
     ATH_MSG_ERROR("A list of triggers needs to be provided");
     return StatusCode::FAILURE;
   }
@@ -65,6 +66,9 @@ StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
   trigMap["2017"] = m_trigList_2017;
   trigMap["2018"] = m_trigList_2018;
   trigMap["2022"] = m_trigList_2022;
+  trigMap["2023"] = m_trigList_2023;
+  trigMap["2024"] = m_trigList_2024;
+  trigMap["2025"] = m_trigList_2025;
 
   // combine all the trigger legs in the expected format
   std::map<std::string, std::string> triggerCombination;

PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/TriggerAnalysisAlgorithms/TrigGlobalEfficiencyAlg.h

@@ -67,6 +67,9 @@ namespace CP
     Gaudi::Property<std::vector<std::string>> m_trigList_2017 {this, "triggers_2017", {}, "2017 trigger selection list"};
     Gaudi::Property<std::vector<std::string>> m_trigList_2018 {this, "triggers_2018", {}, "2018 trigger selection list"};
     Gaudi::Property<std::vector<std::string>> m_trigList_2022 {this, "triggers_2022", {}, "2022 trigger selection list"};
+    Gaudi::Property<std::vector<std::string>> m_trigList_2023 {this, "triggers_2023", {}, "2023 trigger selection list"};
+    Gaudi::Property<std::vector<std::string>> m_trigList_2024 {this, "triggers_2024", {}, "2024 trigger selection list"};
+    Gaudi::Property<std::vector<std::string>> m_trigList_2025 {this, "triggers_2025", {}, "2025 trigger selection list"};
 
     /// \brief whether to not apply an event filter
     Gaudi::Property<bool> m_noFilter {this, "noFilter", false, "whether to not apply an event filter"};

PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/python/TriggerAnalysisConfig.py

@@ -85,6 +85,9 @@ class TriggerAnalysisBlock (ConfigBlock):
         alg = config.createAlgorithm( 'CP::TrigGlobalEfficiencyAlg', 'TrigGlobalSFAlg' )
         if config.geometry() == LHCPeriod.Run3:
             alg.triggers_2022 = [trig.replace("HLT_","").replace(" || ", "_OR_") for trig in self.triggerChainsPerYear.get('2022',[])]
+            alg.triggers_2023 = [trig.replace("HLT_","").replace(" || ", "_OR_") for trig in self.triggerChainsPerYear.get('2023',[])]
+            alg.triggers_2024 = [trig.replace("HLT_","").replace(" || ", "_OR_") for trig in self.triggerChainsPerYear.get('2024',[])]
+            alg.triggers_2025 = [trig.replace("HLT_","").replace(" || ", "_OR_") for trig in self.triggerChainsPerYear.get('2025',[])]
         else:
             alg.triggers_2015 = [trig.replace("HLT_","").replace(" || ", "_OR_") for trig in self.triggerChainsPerYear.get('2015',[])]
             alg.triggers_2016 = [trig.replace("HLT_","").replace(" || ", "_OR_") for trig in self.triggerChainsPerYear.get('2016',[])]

Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/data/DataPeriods.cfg

@@ -60,4 +60,13 @@ all		0		999999
 2022:G  435229  435777
 2022:H  435816  439927
 2022:J  440199  440613
-2023	441000  999999
+2023	441000  463427
+2023:D  448996  460443
+2023:E  450360  460348
+2023:F  451094  455924
+2023:G  455975  456749
+2023:I  460179  461002
+2023:J  461096  461096
+2023:K  461321  461534
+2023:L  461633  463427
+2024	464000  999999