diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/Root/TrigGlobalEfficiencyAlg.cxx b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/Root/TrigGlobalEfficiencyAlg.cxx index e27f3479e526707613cee3487a65cfcf044f657c..50ae8fa272f7e799ebafa21072d42f801acf4951 100644 --- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/Root/TrigGlobalEfficiencyAlg.cxx +++ b/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; diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/TriggerAnalysisAlgorithms/TrigGlobalEfficiencyAlg.h b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/TriggerAnalysisAlgorithms/TrigGlobalEfficiencyAlg.h index 032f81ea3e236a6994a742d4e8f0c722ddea5a2c..d6b2e2ca577f2acdd82c8d060c6255440a6567d6 100644 --- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/TriggerAnalysisAlgorithms/TrigGlobalEfficiencyAlg.h +++ b/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"}; diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/python/TriggerAnalysisConfig.py b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/python/TriggerAnalysisConfig.py index dd2e55eff1ce45df3c909c562d2df345bb527ffb..4773b7590a26feaf525354c12dd359f341e51674 100644 --- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/python/TriggerAnalysisConfig.py +++ b/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',[])] diff --git a/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/data/DataPeriods.cfg b/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/data/DataPeriods.cfg index 67c7b826a36d932fbf29804c3a8004f9543d3049..c13433b9b43031e42d77ac652e227c866695c6fe 100644 --- a/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/data/DataPeriods.cfg +++ b/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