CPAlgorithms: two fixes for the global trigger SFs

CPAlgorithms: two fixes for the global trigger SFs

PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/example_config.yaml

@@ -103,7 +103,7 @@ Trigger:
     triggerChainsPerYear:
         '2015':
             - 'HLT_e24_lhmedium_L1EM20VH || HLT_e60_lhmedium || HLT_e120_lhloose'
-            - 'HLT_mu20_iloose_L1MU15 || HLT_mu50'
+            - 'HLT_mu20_iloose_L1MU15 || HLT_mu40'
             - 'HLT_2g20_tight'
         '2016':
             - 'HLT_e26_lhtight_nod0_ivarloose || HLT_e60_lhmedium_nod0 || HLT_e140_lhloose_nod0'

PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py

@@ -10,7 +10,7 @@ from AnalysisAlgorithmsConfig.ConfigAccumulator import ConfigAccumulator, DataTy
 
 # Config:
 triggerChainsPerYear = {
-    '2015': ['HLT_e24_lhmedium_L1EM20VH || HLT_e60_lhmedium || HLT_e120_lhloose', 'HLT_mu20_iloose_L1MU15 || HLT_mu50', 'HLT_2g20_tight'],
+    '2015': ['HLT_e24_lhmedium_L1EM20VH || HLT_e60_lhmedium || HLT_e120_lhloose', 'HLT_mu20_iloose_L1MU15 || HLT_mu40', 'HLT_2g20_tight'],
     '2016': ['HLT_e26_lhtight_nod0_ivarloose || HLT_e60_lhmedium_nod0 || HLT_e140_lhloose_nod0', 'HLT_mu26_ivarmedium || HLT_mu50', 'HLT_g35_loose_g25_loose'],
     '2017': ['HLT_e26_lhtight_nod0_ivarloose || HLT_e60_lhmedium_nod0 || HLT_e140_lhloose_nod0', 'HLT_2g22_tight_L12EM15VHI', 'HLT_mu50'],
     '2018': ['HLT_e26_lhtight_nod0_ivarloose || HLT_e60_lhmedium_nod0 || HLT_e140_lhloose_nod0', 'HLT_g35_medium_g25_medium_L12EM20VH', 'HLT_mu26_ivarmedium', 'HLT_2mu14'],

PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/Root/TrigGlobalEfficiencyAlg.cxx

@@ -128,8 +128,8 @@ StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
 	handles.push_back(t->getHandle());
 	std::string name = handles[handles.size()-1].name();
 	legsPerTool[name] = triggers;
-	// and add the efficiency systematics (not SF!)
-	if (!isSFTool) ANA_CHECK(m_systematicsList.addSystematics( *handles[handles.size()-1] ));
+	// and add the systematics
+	ANA_CHECK(m_systematicsList.addSystematics( *handles[handles.size()-1] ));
       }
     }
   }
@@ -158,8 +158,8 @@ StatusCode CP::TrigGlobalEfficiencyAlg::initialize()
 	handles.push_back(t->getHandle());
 	std::string name = handles[handles.size()-1].name();
 	legsPerTool[name] = triggers;
-	// and add the efficiency systematics (not SF!)
-	if (!isSFTool) ANA_CHECK(m_systematicsList.addSystematics( *handles[handles.size()-1] ));
+	// and add the systematics
+	ANA_CHECK(m_systematicsList.addSystematics( *handles[handles.size()-1] ));
       }
     }
   }

PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/python/TriggerAnalysisSFConfig.py

@@ -152,6 +152,13 @@ class TriggerAnalysisSFBlock (ConfigBlock):
 
     def makeAlgs (self, config) :
 
+        if (self.multiTriggerChainsPerYear and self.triggerChainsPerYear and
+            self.triggerChainsPerYear is not self.multiTriggerChainsPerYear.get('')):
+            raise Exception('multiTriggerChainsPerYear and triggerChainsPerYear cannot be configured at the same time!')
+
+        if self.triggerChainsPerYear and not self.multiTriggerChainsPerYear:
+            self.multiTriggerChainsPerYear = {'': self.triggerChainsPerYear}
+
         # Create the decision algorithm, keeping track of the decision tool for later
         decisionTool = self.makeTriggerDecisionTool(config)
 
@@ -160,7 +167,7 @@ class TriggerAnalysisSFBlock (ConfigBlock):
 
         # Calculate multi-lepton (electron/muon/photon) trigger efficiencies and SFs
         if self.multiTriggerChainsPerYear and not self.noGlobalTriggerEff:
-            for suffix, trigger_chains in self.multiTriggerChainsPerYear:
+            for suffix, trigger_chains in self.multiTriggerChainsPerYear.items():
                 self.triggerChainsPerYear = trigger_chains
                 self.makeTriggerGlobalEffCorrAlg(config, matchingTool, self.noEffSF, suffix)
 

Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/Root/TrigGlobalEfficiencyCorrectionTool.cxx

@@ -1056,7 +1056,9 @@ CP::SystematicSet TrigGlobalEfficiencyCorrectionTool::recommendedSystematics() c
 StatusCode TrigGlobalEfficiencyCorrectionTool::applySystematicVariation(const CP::SystematicSet& systematic)
 {
   for (auto&& t: m_suppliedElectronEfficiencyTools) ANA_CHECK(t->applySystematicVariation(systematic));
+  for (auto&& t: m_suppliedElectronScaleFactorTools) ANA_CHECK(t->applySystematicVariation(systematic));
   for (auto&& t: m_suppliedPhotonEfficiencyTools) ANA_CHECK(t->applySystematicVariation(systematic));
+  for (auto&& t: m_suppliedPhotonScaleFactorTools) ANA_CHECK(t->applySystematicVariation(systematic));
   for (auto&& t: m_suppliedMuonTools) ANA_CHECK(t->applySystematicVariation(systematic));
 
   return StatusCode::SUCCESS;