update b-tag funct, move HLTSchedule -> schedule (include cms-sw#35858)

silviodonato · Nov 22, 2021 · d89d7da · d89d7da
1 parent 0b031c0
commit d89d7da
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 51 deletions.
diff --git a/HLTrigger/Configuration/python/Run3/applyL2TauTag.py b/HLTrigger/Configuration/python/Run3/applyL2TauTag.py
@@ -110,6 +110,6 @@ def update(process):
     old_diTau_paths = ['HLT_IsoMu24_eta2p1_TightChargedIsoPFTauHPS35_Trk1_eta2p1_Reg_CrossL1_v1', 'HLT_IsoMu24_eta2p1_MediumChargedIsoPFTauHPS35_Trk1_TightID_eta2p1_Reg_CrossL1_v1','HLT_IsoMu24_eta2p1_TightChargedIsoPFTauHPS35_Trk1_TightID_eta2p1_Reg_CrossL1_v1','HLT_IsoMu24_eta2p1_MediumChargedIsoPFTauHPS35_Trk1_eta2p1_Reg_CrossL1_v4','HLT_IsoMu24_eta2p1_MediumChargedIsoPFTauHPS30_Trk1_eta2p1_Reg_CrossL1_v1','HLT_DoubleMediumChargedIsoPFTauHPS30_L1MaxMass_Trk1_eta2p1_Reg_v1','HLT_DoubleTightChargedIsoPFTauHPS35_Trk1_eta2p1_Reg_v1','HLT_DoubleMediumChargedIsoPFTauHPS35_Trk1_TightID_eta2p1_Reg_v1','HLT_DoubleTightChargedIsoPFTauHPS35_Trk1_TightID_eta2p1_Reg_v1','HLT_DoubleMediumChargedIsoPFTauHPS40_Trk1_eta2p1_Reg_v1','HLT_DoubleTightChargedIsoPFTauHPS40_Trk1_eta2p1_Reg_v1','HLT_DoubleMediumChargedIsoPFTauHPS40_Trk1_TightID_eta2p1_Reg_v1','HLT_DoubleTightChargedIsoPFTauHPS40_Trk1_TightID_eta2p1_Reg_v1']
     for i in old_diTau_paths:
         if i in process.__dict__:
-            process.HLTSchedule.remove(getattr(process, i))
+            process.schedule.remove(getattr(process, i))
 
     return process
diff --git a/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_GlobalCalo_GlobalPF.py b/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_GlobalCalo_GlobalPF.py
@@ -573,17 +573,17 @@ def customizeRun3_BTag_GlobalCalo_GlobalPF(process, addDeepJetPaths = True):
                 cms.PSet(
                     name = cms.string("BvsAll"),
                     numerator = cms.VInputTag(
-                        "hltPFDeepFlavourJetTags:probb",
-                        "hltPFDeepFlavourJetTags:probbb",
-                        "hltPFDeepFlavourJetTags:problepb",
+                        cms.InputTag("hltPFDeepFlavourJetTags:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:problepb"),
                         ),
                     denominator=cms.VInputTag(
-                        "hltPFDeepFlavourJetTags:probb",
-                        "hltPFDeepFlavourJetTags:probbb",
-                        "hltPFDeepFlavourJetTags:problepb",
-                        "hltPFDeepFlavourJetTags:probc",
-                        "hltPFDeepFlavourJetTags:probuds",
-                        "hltPFDeepFlavourJetTags:probg",
+                        cms.InputTag("hltPFDeepFlavourJetTags:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:problepb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probc"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probuds"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probg"),
                         ),
                 ),
             )

diff --git a/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_ROICalo_GlobalPF.py b/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_ROICalo_GlobalPF.py
@@ -572,17 +572,17 @@ def customizeRun3_BTag_ROICalo_GlobalPF(process, addDeepJetPaths = True):
                 cms.PSet(
                     name = cms.string("BvsAll"),
                     numerator = cms.VInputTag(
-                        "hltPFDeepFlavourJetTags:probb",
-                        "hltPFDeepFlavourJetTags:probbb",
-                        "hltPFDeepFlavourJetTags:problepb",
+                        cms.InputTag("hltPFDeepFlavourJetTags:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:problepb"),
                         ),
                     denominator=cms.VInputTag(
-                        "hltPFDeepFlavourJetTags:probb",
-                        "hltPFDeepFlavourJetTags:probbb",
-                        "hltPFDeepFlavourJetTags:problepb",
-                        "hltPFDeepFlavourJetTags:probc",
-                        "hltPFDeepFlavourJetTags:probuds",
-                        "hltPFDeepFlavourJetTags:probg",
+                        cms.InputTag("hltPFDeepFlavourJetTags:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:problepb"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probc"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probuds"),
+                        cms.InputTag("hltPFDeepFlavourJetTags:probg"),
                         ),
                 ),
             )

diff --git a/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_ROICalo_ROIPF.py b/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_ROICalo_ROIPF.py
@@ -572,17 +572,17 @@ def customizeRun3_BTag_ROICalo_ROIPF(process, addDeepJetPaths = True):
                 cms.PSet(
                     name = cms.string("BvsAll"),
                     numerator = cms.VInputTag(
-                        "hltPFDeepFlavourJetTagsROIForBTag:probb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probbb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:problepb",
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:problepb"),
                         ),
                     denominator=cms.VInputTag(
-                        "hltPFDeepFlavourJetTagsROIForBTag:probb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probbb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:problepb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probc",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probuds",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probg",
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:problepb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probc"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probuds"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag", "probg"),
                         ),
                 ),
             )

diff --git a/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_noCalo_ROIPF.py b/HLTrigger/Configuration/python/Run3/customizeRun3_BTag_noCalo_ROIPF.py
@@ -572,17 +572,17 @@ def customizeRun3_BTag_noCalo_ROIPF(process, addDeepJetPaths = True):
                 cms.PSet(
                     name = cms.string("BvsAll"),
                     numerator = cms.VInputTag(
-                        "hltPFDeepFlavourJetTagsROIForBTag:probb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probbb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:problepb",
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:problepb"),
                         ),
                     denominator=cms.VInputTag(
-                        "hltPFDeepFlavourJetTagsROIForBTag:probb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probbb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:problepb",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probc",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probuds",
-                        "hltPFDeepFlavourJetTagsROIForBTag:probg",
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probbb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:problepb"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probc"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probuds"),
+                        cms.InputTag("hltPFDeepFlavourJetTagsROIForBTag:probg"),
                         ),
                 ),
             )

diff --git a/HLTrigger/Configuration/python/Run3/downloadCustomizationFunctions.sh b/HLTrigger/Configuration/python/Run3/downloadCustomizationFunctions.sh
@@ -8,14 +8,6 @@ curl -O https://raw.githubusercontent.com/annamasce/TauTriggerTools/triggerRnD_c
 curl -O https://raw.githubusercontent.com/khaosmos93/MuonHLTForRun3/master/customizeMuonHLTForRun3.py
 curl -O https://raw.githubusercontent.com/khaosmos93/MuonHLTForRun3/master/mvaScale.py
 
-#Fix for CMSSW_12_1_0_pre3 (#33885)
-
-for file in customise_TRK*py; do
-    sed -i 's/from PhysicsTools.PatAlgos.slimming.primaryVertexAssociation_cfi import primaryVertexAssociation/from CommonTools.RecoAlgos.primaryVertexAssociation_cfi import primaryVertexAssociation/g' $file
-done
-
-sed -i 's/process.schedule.remove/process.HLTSchedule.remove/g' applyL2TauTag.py
-
 sed -i 's/import HLTrigger.Configuration.MuonHLTForRun3.mvaScale/from . import mvaScale/g' customizeMuonHLTForRun3.py
 
 cat runHLTPaths_cfg.py | grep "def fixMenu" -A100  | grep "def prescale_path(path,ps_service)" -B100  | grep -v prescale_path > tmp.py

diff --git a/HLTrigger/Configuration/python/Run3/dumps/makeDumps.sh b/HLTrigger/Configuration/python/Run3/dumps/makeDumps.sh
@@ -1,5 +1,5 @@
-# hltGetConfiguration /dev/CMSSW_12_2_0/GRun/V5 --open > hlt_open.py , remove cms.ignore from process.hltAlCa***RecHitsFilter**onlyRegional
-# hltGetConfiguration /dev/CMSSW_12_2_0/GRun/V5 > hlt.py
+# hltGetConfiguration /dev/CMSSW_12_1_0/GRun/V14 --open > hlt_open.py , remove cms.ignore from process.hltAlCa***RecHitsFilter**onlyRegional
+# hltGetConfiguration /dev/CMSSW_12_1_0/GRun/V14 > hlt.py
 
 common_text='''
 from hlt import process,_customInfo
@@ -37,8 +37,8 @@ for el in list(els):
 
 #for funct in MUO_newIO;
 #for funct in combined;
-#for funct in TRK_newTracking MUO_newTracking MUO_updateTkMu MUO_updateOpenMu MUO_updateNoVtx MUO_newIO MUO_newOI BTV_noCalo_roiPF_DeepCSV BTV_noCalo_roiPF_DeepJet BTV_roiCalo_roiPF_DeepCSV BTV_roiCalo_roiPF_DeepJet BTV_roiCalo_globalPF_DeepCSV BTV_roiCalo_globalPF_DeepJet BTV_globalCalo_globalPF_DeepCSV BTV_globalCalo_globalPF_DeepJet MUO_useGEM MUO_newReco combined nothing;
-for funct in combination;
+for funct in TRK_newTracking MUO_newTracking MUO_updateTkMu MUO_updateOpenMu MUO_updateNoVtx MUO_newIO MUO_newOI BTV_noCalo_roiPF_DeepCSV BTV_noCalo_roiPF_DeepJet BTV_roiCalo_roiPF_DeepCSV BTV_roiCalo_roiPF_DeepJet BTV_roiCalo_globalPF_DeepCSV BTV_roiCalo_globalPF_DeepJet BTV_globalCalo_globalPF_DeepCSV BTV_globalCalo_globalPF_DeepJet MUO_useGEM MUO_newReco combination nothing;
+#for funct in combination;
 do 
     fname=$funct".py"
     fnameDump=$funct"_dump.py"
@@ -58,9 +58,9 @@ do
         fi;
         echo -e "process = "$funct"(process)\n" >> $fname
     fi;
-   echo -e "$for_confdb" >> $fname && edmConfigDump  $fname > $fnameDump && python -m py_compile $fnameDump &
+#   echo -e "$for_confdb" >> $fname && edmConfigDump  $fname > $fnameDump && python -m py_compile $fnameDump &
  ## Run Dump for update on ConfDB
-#    echo -e "$for_test" >> $fname && edmConfigDump $fname > $fnameDump && CUDA_DEVICES= cmsRun $fnameDump >& $fnameLog & ## Run Test
+    echo -e "$for_test" >> $fname && edmConfigDump $fname > $fnameDump && CUDA_DEVICES= cmsRun $fnameDump >& $fnameLog & ## Run Test
 done;
 
 #process = TRK_newTracking(process)  New Tracking (patatrack tracks + single iteration)