Skip to content
Snippets Groups Projects
Commit aab75a4f authored by Tadej Novak's avatar Tadej Novak
Browse files

Merge branch 'bugfix_multiTrigSFs' into 'main'

Bug fix in TrigGlobalEfficiencyAlg for running with multiple different object ID/Iso working points

See merge request !75596
parents f73d2e15 981fb52c
Branches svn/tags/GAUDI_v19r4-pre@6013
No related tags found
16 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!76343Draft: MooTrackBuilder: Recalibrate NSW hits in refine method,!75703Draft: Update to HI han config for HLT jets,!75596Bug fix in TrigGlobalEfficiencyAlg for running with multiple different object ID/Iso working points,!75127Draft: Seeder types rebase2 grid fix
......@@ -118,7 +118,7 @@ StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
for (bool isSFTool : {true, false}) { // one tool instance for efficiencies, another for scale factors
auto t = m_electronToolsFactory.emplace(m_electronToolsFactory.end(),
"AsgElectronEfficiencyCorrectionTool/ElTrigEff_"
+ std::to_string(isSFTool) + "_" + std::to_string(nTools));
+ std::to_string(isSFTool) + "_" + std::to_string(nTools) + "_" + m_electronID.value() + "_" + m_electronIsol.value());
if (!m_isRun3Geo) {
ANA_CHECK(t->setProperty("MapFilePath", "ElectronEfficiencyCorrection/2015_2018/rel21.2/Precision_Summer2020_v1/map4.txt"));
}
......@@ -155,7 +155,7 @@ StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
for (bool isSFTool : {true, false}) { // one tool instance for efficiencies, another for scale factors
auto t = m_photonToolsFactory.emplace(m_photonToolsFactory.end(),
"AsgPhotonEfficiencyCorrectionTool/PhTrigEff_"
+ std::to_string(isSFTool) + "_" + std::to_string(nTools));
+ std::to_string(isSFTool) + "_" + std::to_string(nTools) + "_" + m_photonIsol.value());
if (!m_isRun3Geo) {
ANA_CHECK(t->setProperty("MapFilePath", "PhotonEfficiencyCorrection/2015_2018/rel21.2/Summer2020_Rec_v1/map3.txt"));
}
......@@ -179,7 +179,7 @@ StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
ToolHandleArray<CP::IMuonTriggerScaleFactors> muonTools;
if (!m_muonsHandle.empty() && !m_doMatchingOnly) {
if (m_muonID.empty()) ATH_MSG_ERROR("Muon ID was not set for TrigGlobalEfficiencyAlg!");
m_muonTool = asg::AnaToolHandle<CP::IMuonTriggerScaleFactors>("CP::MuonTriggerScaleFactors/MuonTrigEff");
m_muonTool = asg::AnaToolHandle<CP::IMuonTriggerScaleFactors>("CP::MuonTriggerScaleFactors/MuonTrigEff_" + m_muonID.value());
ANA_CHECK(m_muonTool.setProperty("MuonQuality", m_muonID.value()));
ANA_CHECK(m_muonTool.setProperty("AllowZeroSF", true));
ANA_CHECK(m_muonTool.initialize());
......@@ -190,7 +190,7 @@ StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
}
// finally, set up the global trigger tool
m_tgecTool = asg::AnaToolHandle<ITrigGlobalEfficiencyCorrectionTool>("TrigGlobalEfficiencyCorrectionTool/TrigGlobal");
m_tgecTool = asg::AnaToolHandle<ITrigGlobalEfficiencyCorrectionTool>("TrigGlobalEfficiencyCorrectionTool/TrigGlobal_" + this->name() );
ANA_CHECK(m_tgecTool.setProperty("ElectronEfficiencyTools", electronEffTools));
ANA_CHECK(m_tgecTool.setProperty("ElectronScaleFactorTools", electronSFTools));
ANA_CHECK(m_tgecTool.setProperty("PhotonEfficiencyTools", photonEffTools));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment