Merge branch 'master-dq-egamma-irreproducibility' into 'master'

Fix incorrect egamma working point names

See merge request !32058

Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py

@@ -142,28 +142,28 @@ def MonitorElectronConfig(inputFlags):
     # elLHLooseTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
 
     elCBTightMonAlg.ParticleContainerName = "Electrons"
-    elCBTightMonAlg.RecoName = "CBTight"
+    elCBTightMonAlg.RecoName = "Tight"
     elCBTightMonAlg.ParticlePrefix = "electron"
     elCBTightMonAlg.CheckTrigger = False 
     # to enable a trigger filter, for example:
     # elCBTightMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
 
     elCBTightTrigMonAlg.ParticleContainerName = "Electrons"
-    elCBTightTrigMonAlg.RecoName = "CBTight"
+    elCBTightTrigMonAlg.RecoName = "Tight"
     elCBTightTrigMonAlg.ParticlePrefix = "electron"
     elCBTightTrigMonAlg.CheckTrigger = True 
     # to enable a trigger filter, for example:
     # elCBTightTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
 
     elCBLooseMonAlg.ParticleContainerName = "Electrons"
-    elCBLooseMonAlg.RecoName = "CBLoose"
+    elCBLooseMonAlg.RecoName = "Loose"
     elCBLooseMonAlg.ParticlePrefix = "electron"
     elCBLooseMonAlg.CheckTrigger = False 
     # to enable a trigger filter, for example:
     # elCBLooseMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
 
     elCBLooseTrigMonAlg.ParticleContainerName = "Electrons"
-    elCBLooseTrigMonAlg.RecoName = "CBLoose"
+    elCBLooseTrigMonAlg.RecoName = "Loose"
     elCBLooseTrigMonAlg.ParticlePrefix = "electron"
     elCBLooseTrigMonAlg.CheckTrigger = True 
     # to enable a trigger filter, for example:
@@ -262,14 +262,14 @@ def MonitorPhotonConfig(inputFlags):
     # Edit properties of algorithms
 
     phCBTightMonAlg.ParticleContainerName = "Photons"
-    phCBTightMonAlg.RecoName = "CBTight"
+    phCBTightMonAlg.RecoName = "Tight"
     phCBTightMonAlg.ParticlePrefix = "photon"
     phCBTightMonAlg.CheckTrigger = False 
     # to enable a trigger filter, for example:
     # phCBTightMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
 
     phCBTightTrigMonAlg.ParticleContainerName = "Photons"
-    phCBTightTrigMonAlg.RecoName = "CBTight"
+    phCBTightTrigMonAlg.RecoName = "Tight"
     phCBTightTrigMonAlg.ParticlePrefix = "photon"
     phCBTightTrigMonAlg.CheckTrigger = True 
     phCBTightTrigMonAlg.WithTrigger = "WithTrigger" 
@@ -277,14 +277,14 @@ def MonitorPhotonConfig(inputFlags):
     # phCBTightTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
 
     phCBLooseMonAlg.ParticleContainerName = "Photons"
-    phCBLooseMonAlg.RecoName = "CBLoose"
+    phCBLooseMonAlg.RecoName = "Loose"
     phCBLooseMonAlg.ParticlePrefix = "photon"
     phCBLooseMonAlg.CheckTrigger = False 
     # to enable a trigger filter, for example:
     # phCBLooseMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
 
     phCBLooseTrigMonAlg.ParticleContainerName = "Photons"
-    phCBLooseTrigMonAlg.RecoName = "CBLoose"
+    phCBLooseTrigMonAlg.RecoName = "Loose"
     phCBLooseTrigMonAlg.ParticlePrefix = "photon"
     phCBLooseTrigMonAlg.CheckTrigger = True 
     phCBLooseTrigMonAlg.WithTrigger = "WithTrigger" 

Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx

@@ -66,7 +66,10 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
 
       // Check that the electron meets our requirements
       bool isGood;
-      e_iter->passSelection(isGood,m_RecoName);
+      if (! e_iter->passSelection(isGood,m_RecoName)) {
+        ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point");
+        break; // no point in continuing
+      }
       if(isGood) {np++;}
       else continue;
                            

Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx

@@ -65,9 +65,12 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
     np = 0;
     for (const auto& e_iter : *photons) {
 
-      // Check that the electron meets our requirements
+      // Check that the photon meets our requirements
       bool isGood;
-      e_iter->passSelection(isGood,m_RecoName);
+      if (! e_iter->passSelection(isGood,m_RecoName)) {
+        ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point");
+        break; // no point in continuing
+      }
       if(isGood) {np++;}
       else continue;