diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx index ab6d6f9ed1d42235fb55481846e00ecda9330e8f..45e46ae0dac3556817d61de5982ba98595ee5d61 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx @@ -265,8 +265,8 @@ namespace top { "Failed to set MuonQuality for " + name); top::check(asg::setProperty(tool, "AllowZeroSF", true), "Failed to set AllowZeroSF for " + name); - if (m_config->muonSFCustomInputFolder() != " ") { - top::check(asg::setProperty(tool, "CustomInputFolder", m_config->muonSFCustomInputFolder()), + if (m_config->muonSFCustomInputFolderTrigger() != " ") { + top::check(asg::setProperty(tool, "CustomInputFolder", m_config->muonSFCustomInputFolderTrigger()), "Failed to set CustomInputFolder property for MuonTriggerScaleFactors tool"); } if (m_config->muonForcePeriod() != " ") { diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx index d797f6f6f8a2e52fe461107e1c6564937b177e81..b4a585d6181809c57d5c5ff6f8037d897fc2186c 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx @@ -183,6 +183,9 @@ namespace top { registerParameter("MuonSFCustomInputFolder", "EXPERT OPTION! Tells the MuonEfficiencyScaleFactors tools to use a custom input folder path. If set to \" \" will use the default", " "); + registerParameter("MuonSFCustomInputFolderTrigger", + "EXPERT OPTION! Tells the MuonEfficiencyScaleFactors trigger tools to use a custom input folder path. If set to \" \" will use the default", + " "); registerParameter("MuonForceYear", "EXPERT OPTION! Tells the MuonEfficiencyScaleFactors tools to use a custom Year. If set to -1 will use the default", "-1"); diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx index 8709b182c7eb27d99e7b6943828f8b59339a110a..76098302d929bfc403a06f190bcbdb3b3205d750 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx @@ -1286,6 +1286,10 @@ namespace top { std::string const& customMuonSF = settings->value("MuonSFCustomInputFolder"); this->muonSFCustomInputFolder(customMuonSF); } + { + std::string const& customMuonSFTrigger = settings->value("MuonSFCustomInputFolderTrigger"); + this->muonSFCustomInputFolderTrigger(customMuonSFTrigger); + } { int customMuonForceYear = std::stoi(settings->value("MuonForceYear")); this->muonForceYear(customMuonForceYear); diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h index bec3147381044df6be480e45b77f13c25c99cc82..61ef2b1f1899c377904aae13af33f296fbf100d5 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h +++ b/PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h @@ -1125,6 +1125,12 @@ namespace top { m_muonSFCustomInputFolder = s; } } + std::string const& muonSFCustomInputFolderTrigger() const {return m_muonSFCustomInputFolderTrigger;} + void muonSFCustomInputFolderTrigger(const std::string& s) { + if (!m_configFixed) { + m_muonSFCustomInputFolderTrigger = s; + } + } int muonForceYear() const {return m_muonForceYear;} void muonForceYear(int s) { if (!m_configFixed) { @@ -2464,6 +2470,7 @@ namespace top { bool m_muonMuonDoExtraSmearingHighPt; //to turn on/off a special correction for the muon with high momenta. bool m_muonBreakDownSystematics; //to turn on/off a more complex systematic model std::string m_muonSFCustomInputFolder; + std::string m_muonSFCustomInputFolderTrigger; std::string m_muonForcePeriod; int m_muonForceYear; std::string m_muonForceTrigger;