Draft: Update cmssw 13

BackgroundEstimation/plugins/EventL1ETMProducer.cc

@@ -64,6 +64,7 @@ EventL1ETMProducer<T>::beginRun (const edm::Run &run, const edm::EventSetup &set
 template<class T> void
 EventL1ETMProducer<T>::AddVariables (const edm::Event &event, const edm::EventSetup &setup)
 {
+
   edm::Handle<edm::TriggerResults> triggers;
   event.getByToken (tokenTriggers_, triggers);
 
@@ -155,6 +156,8 @@ EventL1ETMProducer<T>::AddVariables (const edm::Event &event, const edm::EventSe
     (*eventvariables)["passes_" + additionalFilters_.at (i)] = anatools::triggerObjectExists (event, *triggers, *triggerObjects, additionalCollections_.at (i), additionalFilters_.at (i));
 }
 
+
+
 template<class T> const string
 EventL1ETMProducer<T>::tagCollectionParameter () const
 {

BackgroundEstimation/plugins/EventTPProducer.cc

@@ -373,8 +373,12 @@ EventTPProducer<osu::Electron>::passesVeto (const osu::Track &probe) const
   bool passes = probe.deltaRToClosestPFElectron () > 0.15
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
-#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM // Verification Needed !
-  bool passes = probe.deltaRToClosestPFElectron () > 0.15
+#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM
+  bool passes = probe.deltaRToClosestElectron () > 0.15
+             && probe.caloNewNoPUDRp5CentralCalo () < 10.0
+             && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
+#elif DATA_FORMAT == MINI_AOD_ONLY_2022_CUSTOM
+  bool passes = probe.deltaRToClosestElectron () > 0.15
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
 #else
@@ -392,7 +396,9 @@ EventTPProducer<osu::Electron>::passesLooseVeto (const osu::Track &probe) const
   bool passes = probe.deltaRToClosestVetoElectron () > 0.15
 #if DATA_FORMAT == MINI_AOD_2017
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
-#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM // Verification Needed !
+#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM
+             && probe.caloNewNoPUDRp5CentralCalo () < 10.0
+#elif DATA_FORMAT == MINI_AOD_ONLY_2022_CUSTOM
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
 #else
              && probe.caloNewNoPUDRp5CentralCalo () < 10.0
@@ -404,7 +410,7 @@ EventTPProducer<osu::Electron>::passesLooseVeto (const osu::Track &probe) const
 template<class T, class... Args> template<class T0> bool
 EventTPProducer<T, Args...>::matchedToTag (const osu::Track &probe, const vector<T0> &tags) const
 {
-  for (const auto tag : tags) {
+  for (const auto &tag : tags) {
     if (deltaR (probe, tag) < probeTagMatchingDR_) return true;
   }
   return false;
@@ -416,8 +422,8 @@ EventTPProducer<osu::Muon>::passesVeto (const osu::Track &probe) const
 #if DATA_FORMAT == MINI_AOD_2017
   bool passes = probe.deltaRToClosestPFMuon () > 0.15
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
-#elif DATA_FORMAT == MINI_AOD_2022  // Verification Needed !
-  bool passes = probe.deltaRToClosestPFMuon () > 0.15
+#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM || DATA_FORMAT == MINI_AOD_ONLY_2022_CUSTOM
+  bool passes = probe.deltaRToClosestMuon () > 0.15
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
 #else
   bool passes = probe.deltaRToClosestMuon () > 0.15
@@ -443,8 +449,13 @@ EventTPProducer<osu::Electron, osu::Tau>::passesVeto (const osu::Track &probe) c
              && probe.dRMinJet () > 0.5
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
-#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM // Verification needed !
-  bool passes = probe.deltaRToClosestPFChHad () > 0.15
+#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM
+  bool passes = probe.deltaRToClosestTauHad () > 0.15
+             && probe.dRMinJet () > 0.5
+             && probe.caloNewNoPUDRp5CentralCalo () < 10.0
+             && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
+#elif DATA_FORMAT == MINI_AOD_ONLY_2022_CUSTOM
+  bool passes = probe.deltaRToClosestTauHad () > 0.15
              && probe.dRMinJet () > 0.5
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
@@ -464,7 +475,9 @@ EventTPProducer<osu::Electron, osu::Tau>::passesLooseVeto (const osu::Track &pro
   bool passes = probe.deltaRToClosestVetoElectron () > 0.15
 #if DATA_FORMAT == MINI_AOD_2017
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
-#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM //Verification needed
+#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM
+             && probe.caloNewNoPUDRp5CentralCalo () < 10.0
+#elif DATA_FORMAT == MINI_AOD_ONLY_2022_CUSTOM
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
 #else
              && probe.caloNewNoPUDRp5CentralCalo () < 10.0
@@ -481,8 +494,13 @@ EventTPProducer<osu::Muon, osu::Tau>::passesVeto (const osu::Track &probe) const
              && probe.dRMinJet () > 0.5
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
-#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM //Verification needed
-  bool passes = probe.deltaRToClosestPFChHad () > 0.15
+#elif DATA_FORMAT == MINI_AOD_2022_CUSTOM
+  bool passes = probe.deltaRToClosestTauHad () > 0.15
+             && probe.dRMinJet () > 0.5
+             && probe.caloNewNoPUDRp5CentralCalo () < 10.0
+             && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;
+#elif DATA_FORMAT == MINI_AOD_ONLY_2022_CUSTOM
+  bool passes = probe.deltaRToClosestTauHad () > 0.15
              && probe.dRMinJet () > 0.5
              && (probe.matchedCaloJetEmEnergy() + probe.matchedCaloJetHadEnergy()) < 10.0
              && probe.hitAndTOBDrop_bestTrackMissingOuterHits () >= 3.0;

BackgroundEstimation/python/ElectronTagProbeSelections.py

@@ -6,7 +6,7 @@
 def createHitsVariations (ch, chName):
     globals ().update (createChannelVariations (ch, chName, None, cutTrkNLayersVariations))
     globals ().update (createChannelVariations (ch, chName, cutTrkNValidHitsSignal, cutTrkNValidHitsVariations))
-    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
         replaceSingleCut (globals ()[chName + 'NHits3'].cuts,   cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
         replaceSingleCut (globals ()[chName + 'NLayers3'].cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
 
@@ -26,7 +26,7 @@ def createHitsVariations (ch, chName):
     cutElectronTightID,
     cutElectronTightPFIso,
 ]
-if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
     tagElectronCuts = [
         cutMetFilters,
         cutElectronPt,
@@ -203,6 +203,10 @@ def createHitsVariations (ch, chName):
 ElectronFiducialCalcBeforeInvestigate2018Ineff.name = cms.string("ElectronFiducialCalcBeforeInvestigate2018Ineff")
 addCuts(ElectronFiducialCalcBeforeInvestigate2018Ineff.cuts, [cutTrkInvestigate2018Ineff])
 
+ElectronDeepSetsBeforeOldCuts = copy.deepcopy(ElectronFiducialCalcBeforeOldCuts)
+ElectronDeepSetsBeforeOldCuts.name = cms.string("ElectronDeepSetsBeforeOldCuts")
+addCuts(ElectronDeepSetsBeforeOldCuts.cuts, [cutDeepSets])
+
 ElectronFiducialCalcAfter = copy.deepcopy(ZtoEleProbeTrkWithZCuts)
 ElectronFiducialCalcAfter.name = cms.string("ElectronFiducialCalcAfter")
 addSingleCut(ElectronFiducialCalcAfter.cuts, cutTrkVetoElecVeto, cutEleTrkOS)
@@ -216,6 +220,10 @@ def createHitsVariations (ch, chName):
     replaceSingleCut(ElectronFiducialCalcAfterOldCuts.cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
     replaceSingleCut(ElectronFiducialCalcAfterOldCuts.cuts, cutTrkNValidHits[7], cutTrkNValidHitsSignal)
 
+ElectronDeepSetsAfter = copy.deepcopy(ElectronFiducialCalcBeforeOldCuts)
+ElectronDeepSetsAfter.name = cms.string("ElectronDeepSetsAfter")
+addCuts(ElectronDeepSetsAfter.cuts, [cutTrkDeepSets])
+
 ZtoEleDisTrk = copy.deepcopy(ZtoEleProbeTrkWithZCuts)
 ZtoEleDisTrk.name = cms.string("ZtoEleDisTrk")
 addSingleCut(ZtoEleDisTrk.cuts, cutTrkNMissOut, cutEleTrkOS)
@@ -256,6 +264,8 @@ def createHitsVariations (ch, chName):
 createHitsVariations (ZtoEleProbeTrkWithSSFilter, "ZtoEleProbeTrkWithSSFilter")
 createHitsVariations (ZtoEleProbeTrkWithLooseFilter,   "ZtoEleProbeTrkWithLooseFilter")
 createHitsVariations (ZtoEleProbeTrkWithLooseSSFilter, "ZtoEleProbeTrkWithLooseSSFilter")
+createHitsVariations (ElectronTagPt35NoJetCuts,            "ElectronTagPt35NoJetCuts")
+createHitsVariations (ElectronTagPt35NoJetCutsMetTrig,     "ElectronTagPt35NoJetCutsMetTrig")
 
 # create copies of all above selections with the fiducial electron/muon cuts removed
 for selection in list (locals ()):

BackgroundEstimation/python/EventL1ETMProducer_cfi.py

@@ -108,7 +108,7 @@ def customizeForL1ETMProducer (producer):
             print("# Unknown producer type! Cannot set collection for tag lepton.")
             exit (1)
 
-    elif os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+    elif os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
         print("# Using 2022 MET trigger filters in EventL1ETMProducer_cfg.py...")
 
         # The items in each vector correspond to the following triggers, in this order:
@@ -121,7 +121,7 @@ def customizeForL1ETMProducer (producer):
         producer.additionalCollections = cms.vstring ()
         producer.additionalFilters     = cms.vstring ()
 
-        producer.l1Prescales = cms.FileInPath ("DisappTrks/BackgroundEstimation/data/l1ETM_2017.txt") #Should be fixed later
+        producer.l1Prescales = cms.FileInPath ("DisappTrks/BackgroundEstimation/data/l1ETM_2022.txt") #Should be fixed later
 
         if producer.type_ () == "EventElectronL1ETMProducer":
             producer.tagCollection = cms.string ("hltGtStage2Digis:EGamma:HLT")

BackgroundEstimation/python/EventMETTriggerProducer_cfi.py

@@ -194,7 +194,7 @@ def customizeForMETTriggerProducer (producer):
         producer.additionalCollections           = cms.vstring(["hltTrk50Filter::HLT"] + [""] * 8)
         producer.additionalFilters               = cms.vstring(["hltTrk50Filter"] + [""] * 8)
 
-    elif os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+    elif os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
         print("# Using 2022 MET trigger filters in EventMETTriggerProducer_cfi.py...") #Should be fixed later
 
         # Copied from AllTriggers.py, all triggers in the Grand Or selection

BackgroundEstimation/python/FiducialMapCalculator.py

@@ -95,6 +95,8 @@ def FindHotSpots(self, beforeVeto, afterVeto):
         self._meanInefficiency = meanInefficiency
         self._stdDevInefficiency = stdDevInefficiency
 
+        print(f"Standard Dev of Inefficiency: {stdDevInefficiency}, nRegions: {nRegionsWithTag}")
+
         # now find hot spots where the inefficiency is larger than the meanInefficiency by at least threshold * stdDevInefficiency
 
         for xbin in range(1, efficiency.GetXaxis().GetNbins()):
@@ -265,6 +267,8 @@ def CompareFiducialMap(self):
             existingMapName += '2017_data.root'
         elif '2018' in self.Numerator["sample"]:
             existingMapName += '2017_data.root' # doesn't exist yet, compare to 2017
+        elif '2022' in self.Numerator['sample']:
+            existingMapName += '2017_data.root' #doesn't exist yet, compare to 2017
         existingMapFile = TFile(existingMapName, 'read')
         existingMapDenominator = existingMapFile.Get('beforeVeto')
         existingMapNumerator = existingMapFile.Get('afterVeto')

BackgroundEstimation/python/MuonTagProbeSelections.py

@@ -6,7 +6,7 @@
 def createHitsVariations (ch, chName):
     globals ().update (createChannelVariations (ch, chName, None, cutTrkNLayersVariations))
     globals ().update (createChannelVariations (ch, chName, cutTrkNValidHitsSignal, cutTrkNValidHitsVariations))
-    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
         replaceSingleCut (globals ()[chName + 'NHits3'].cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
         replaceSingleCut (globals ()[chName + 'NLayers3'].cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
 
@@ -190,7 +190,7 @@ def createHitsVariations (ch, chName):
     removeCuts(MuonFiducialCalcBefore.cuts, [cutTrk2017LowEfficiencyRegion])
 if os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_"):
     removeCuts(MuonFiducialCalcBefore.cuts, [cutTrk2018LowEfficiencyRegion])
-if os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+if os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
     removeCuts(MuonFiducialCalcBefore.cuts, [cutTrkEcalo, cutMuonMatchToTrigObj, cutTrkIso]) #FIXME: Make sure this removal is okay
 
 
@@ -200,7 +200,7 @@ def createHitsVariations (ch, chName):
 
 MuonFiducialCalcBeforeOldCuts = copy.deepcopy(MuonFiducialCalcBefore)
 MuonFiducialCalcBeforeOldCuts.name = cms.string("MuonFiducialCalcBeforeOldCuts")
-if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
     replaceSingleCut(MuonFiducialCalcBeforeOldCuts.cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
     replaceSingleCut(MuonFiducialCalcBeforeOldCuts.cuts, cutTrkNValidHits[7], cutTrkNValidHitsSignal)
 
@@ -212,12 +212,12 @@ def createHitsVariations (ch, chName):
     removeCuts(MuonFiducialCalcAfter.cuts, [cutTrk2017LowEfficiencyRegion])
 if os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_"):
     removeCuts(MuonFiducialCalcAfter.cuts, [cutTrk2018LowEfficiencyRegion])
-if os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+if os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
     removeCuts(MuonFiducialCalcAfter.cuts, [cutTrkEcalo, cutMuonMatchToTrigObj, cutTrkIso])  #FIXME: Make sure this removal is okay
 
 MuonFiducialCalcAfterOldCuts = copy.deepcopy(MuonFiducialCalcAfter)
 MuonFiducialCalcAfterOldCuts.name = cms.string("MuonFiducialCalcAfterOldCuts")
-if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
     replaceSingleCut(MuonFiducialCalcAfterOldCuts.cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
     replaceSingleCut(MuonFiducialCalcAfterOldCuts.cuts, cutTrkNValidHits[7], cutTrkNValidHitsSignal)
 
@@ -260,6 +260,8 @@ def createHitsVariations (ch, chName):
 createHitsVariations (ZtoMuProbeTrkWithSSFilter, "ZtoMuProbeTrkWithSSFilter")
 createHitsVariations (ZtoMuProbeTrkWithLooseFilter,   "ZtoMuProbeTrkWithLooseFilter")
 createHitsVariations (ZtoMuProbeTrkWithLooseSSFilter, "ZtoMuProbeTrkWithLooseSSFilter")
+createHitsVariations (MuonTagPt35NoJetCuts,               "MuonTagPt35NoJetCuts")
+createHitsVariations (MuonTagPt35NoJetCutsMetTrig,        "MuonTagPt35NoJetCutsMetTrig")
 
 # create copies of all above selections with the fiducial electron/muon cuts removed
 for selection in list (locals ()):

BackgroundEstimation/python/TauTagProbeSelections.py

@@ -31,7 +31,7 @@ def createHitsVariations (ch, chName):
 if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_"):
     tagTauCuts.append(cutTauTightMVAIso)
 else:
-    tagTauCuts.append(cutTauTightID)
+    tagTauCuts.append(cutTauTightPFIso)
 addCuts(TauTagSkim.cuts, tagTauCuts)
 
 ################################################################################
@@ -325,6 +325,8 @@ def createHitsVariations (ch, chName):
 createHitsVariations (ZtoTauToEleProbeTrkWithZCuts,    "ZtoTauToEleProbeTrkWithZCuts")
 createHitsVariations (ZtoTauToMuDisTrk,                "ZtoTauToMuDisTrk")
 createHitsVariations (ZtoTauToEleDisTrk,               "ZtoTauToEleDisTrk")
+createHitsVariations (TauTagPt55NoJetCuts,             "TauTagPt55NoJetCuts")
+createHitsVariations (TauTagPt55NoJetCutsMetTrig,      "TauTagPt55NoJetCutsMetTrig")
 
 # create copies of all above selections with the fiducial electron/muon cuts removed
 for selection in list (locals ()):

BackgroundEstimation/python/ZtoEESelections.py

@@ -6,7 +6,7 @@
 def createHitsVariations (ch, chName):
     globals ().update (createChannelVariations (ch, chName, None, cutTrkNLayersVariations))
     globals ().update (createChannelVariations (ch, chName, cutTrkNValidHitsSignal, cutTrkNValidHitsVariations))
-    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
         replaceSingleCut (globals ()[chName + 'NHits3'].cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
         replaceSingleCut (globals ()[chName + 'NLayers3'].cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
 
@@ -30,7 +30,7 @@ def createHitsVariations (ch, chName):
     cutEEInvMassZLo,
     cutEEInvMassZHi,
 ]
-if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
     zToEEElectronCuts = [
         cutMetFilters,
         cutElectronPairPt,
@@ -41,6 +41,7 @@ def createHitsVariations (ch, chName):
         cutEEChargeProduct,
         cutEEInvMassZLo,
         cutEEInvMassZHi,
+        cutElectronPt,
     ]
 addCuts(ZtoEE.cuts, zToEEElectronCuts)
 

BackgroundEstimation/python/ZtoMuMuSelections.py

@@ -6,7 +6,7 @@
 def createHitsVariations (ch, chName):
     globals ().update (createChannelVariations (ch, chName, None, cutTrkNLayersVariations))
     globals ().update (createChannelVariations (ch, chName, cutTrkNValidHitsSignal, cutTrkNValidHitsVariations))
-    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_"):
+    if os.environ["CMSSW_VERSION"].startswith ("CMSSW_9_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_10_2_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_12_4_") or os.environ["CMSSW_VERSION"].startswith ("CMSSW_13_0_"):
         replaceSingleCut (globals ()[chName + 'NHits3'].cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)
         replaceSingleCut (globals ()[chName + 'NLayers3'].cuts, cutTrkNValidPixelHits[3], cutTrkNValidPixelHitsSignal)