update trigger names in RelVal code

cms-sw · Nov 3, 2022 · 8a322d4 · 8a322d4
1 parent b29329d
commit 8a322d4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 72 deletions.
diff --git a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvestingSequence_cff.py b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationHarvestingSequence_cff.py
@@ -7,7 +7,7 @@
   MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_3_Bs_v')
 )
 hfv2 = heavyFlavorValidationHarvesting.clone(
-  MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_3_Jpsi_Displaced_v')
+  MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_3_Jpsi_v')
 )
 
 
@@ -17,33 +17,9 @@
 hfvTnP2 = heavyFlavorValidationHarvesting.clone(
     MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_L2Mu2_Upsilon_v')
 )
-hfvTnP3 = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track2_Jpsi_v')
-)
-hfvTnP4 = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track3p5_Jpsi_v')
-)
-hfvTnP5 = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track7_Jpsi_v')
-)
-hfvTnP6 = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track2_Upsilon_v')
-)
-hfvTnP7 = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track3p5_Upsilon_v')
-)
-hfvTnP8 = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Mu7p5_Track7_Upsilon_v')
-)
 
 hfv7 = heavyFlavorValidationHarvesting.clone(
-  MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_JpsiTrk_Displaced_v')
-)
-hfv8 = heavyFlavorValidationHarvesting.clone(
-  MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v')
-)
-hfv9 = heavyFlavorValidationHarvesting.clone(
-  MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v')
+  MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_DoubleMu4_MuMuTrk_Displaced_v')
 )
 
 ### 2017 additions
@@ -96,11 +72,11 @@
 )
 
 hfpsi = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon18_PsiPrime_v')
+    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon14_PsiPrime_v')
 )
 
 hfupsilon = heavyFlavorValidationHarvesting.clone(
-    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon12_Upsilon_eta1p5_v')
+    MyDQMrootFolder = cms.untracked.string(baseFolderPath + 'HLT_Dimuon10_Upsilon_y1p4_v')
 )
 
 
@@ -110,17 +86,13 @@
     cms.untracked.PSet(
       InputMEnames = cms.untracked.vstring(
         'HLT_DoubleMu4_3_Bs_v/effPathDiglobAND_recoEtaPtY',
-        'HLT_DoubleMu4_3_Jpsi_Displaced_v/effPathDiglobAND_recoEtaPtY',
-        'HLT_DoubleMu4_JpsiTrk_Displaced_v/effPathDiglobAND_recoEtaPtY',
-        'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v/effPathDiglobAND_recoEtaPtY',
-        'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v/effPathDiglobAND_recoEtaPtY',
+        'HLT_DoubleMu4_3_Jpsi_v/effPathDiglobAND_recoEtaPtY',
+        'HLT_DoubleMu4_MuMuTrk_Displaced_v/effPathDiglobAND_recoEtaPtY',
       ),
       InputLabels = cms.untracked.vstring(
         'HLT_DoubleMu4_3_Bs_v',
-        'HLT_DoubleMu4_3_Jpsi_Displaced_v',
-        'HLT_DoubleMu4_JpsiTrk_Displaced_v',
-        'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v',
-        'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v',
+        'HLT_DoubleMu4_3_Jpsi_v',
+        'HLT_DoubleMu4_MuMuTrk_Displaced_v',
       ),
       OutputMEname = cms.untracked.string('effPathGlob_recoLowPt')
     )
@@ -132,14 +104,14 @@
     cms.untracked.PSet(
       InputMEnames = cms.untracked.vstring(
           'HLT_Dimuon25_Jpsi_v/effPathDiglobAND_recoEtaPtY',
-          'HLT_Dimuon18_PsiPrime_v/effPathDiglobAND_recoEtaPtY',
-          'HLT_Dimuon12_Upsilon_eta1p5_v/effPathDiglobAND_recoEtaPtY',
+          'HLT_Dimuon14_PsiPrime_v/effPathDiglobAND_recoEtaPtY',
+          'HLT_Dimuon10_Upsilon_y1p4_v/effPathDiglobAND_recoEtaPtY',
           'HLT_Mu30_TkMu0_Onia_v/effPathDiglobAND_recoEtaPtY'
       ),
       InputLabels = cms.untracked.vstring(
           'HLT_Dimuon25_Jpsi_v',
-          'HLT_Dimuon18_PsiPrime_v',
-          'HLT_Dimuon12_Upsilon_eta1p5_v',
+          'HLT_Dimuon14_PsiPrime_v',
+          'HLT_Dimuon10_Upsilon_y1p4_v',
           'HLT_Mu30_TkMu0_Onia_v'
       ),
       OutputMEname = cms.untracked.string('effPathGlob_recoHighPt')
@@ -149,8 +121,8 @@
 
 heavyFlavorValidationHarvestingSequence = cms.Sequence(
   hfv1+hfv2
-  +hfvTnP1+hfvTnP2+hfvTnP3+hfvTnP4+hfvTnP5+hfvTnP6+hfvTnP7+hfvTnP8
-  +hfv7+hfv8+hfv9
+  +hfvTnP1+hfvTnP2
+  +hfv7
     + hfjpsiMuon
     + hfjpsiNoVertexing
     + hfjpsiNoVertexingNoOS

diff --git a/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationSequence_cff.py b/HLTriggerOffline/HeavyFlavor/python/heavyFlavorValidationSequence_cff.py
@@ -8,16 +8,10 @@
     DimuonPtBins = cms.untracked.vdouble(0., 2., 4., 6., 8., 10., 12., 15., 25.)
 )
 hfv2 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_DoubleMu4_3_Jpsi_Displaced_v")
+    TriggerPathName = cms.untracked.string("HLT_DoubleMu4_3_Jpsi_v")
 )
 hfv3 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_DoubleMu4_JpsiTrk_Displaced_v")
-)
-hfv4 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_DoubleMu4_PsiPrimeTrk_Displaced_v")
-)
-hfv5 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v")
+    TriggerPathName = cms.untracked.string("HLT_DoubleMu4_MuMuTrk_Displaced_v")
 )
 
 hfvTnP1 = hfv1.clone(
@@ -26,24 +20,6 @@
 hfvTnP2 = hfv1.clone(
     TriggerPathName = cms.untracked.string("HLT_Mu7p5_L2Mu2_Upsilon_v")
 )
-hfvTnP3 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track2_Jpsi_v")
-)
-hfvTnP4 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track3p5_Jpsi_v")
-)
-hfvTnP5 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track7_Jpsi_v")
-)
-hfvTnP6 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track2_Upsilon_v")
-)
-hfvTnP7 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track3p5_Upsilon_v")
-)
-hfvTnP8 = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Mu7p5_Track7_Upsilon_v")
-)
 
 ## 2017 additions
 hfjpsiMuon = hfv1.clone(
@@ -95,17 +71,17 @@
 )
 
 hfpsi = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Dimuon18_PsiPrime_v")
+    TriggerPathName = cms.untracked.string("HLT_Dimuon14_PsiPrime_v")
 )
 
 hfupsilon = hfv1.clone(
-    TriggerPathName = cms.untracked.string("HLT_Dimuon12_Upsilon_eta1p5_v")
+    TriggerPathName = cms.untracked.string("HLT_Dimuon10_Upsilon_y1p4_v")
 )
 
 
 heavyFlavorValidationSequence = cms.Sequence(
-    hfv1+hfv2+hfv3+hfv4+hfv5
-    +hfvTnP1+hfvTnP2+hfvTnP3+hfvTnP4+hfvTnP5+hfvTnP6+hfvTnP7+hfvTnP8
+    hfv1+hfv2+hfv3
+    +hfvTnP1+hfvTnP2
     + hfjpsiMuon
     + hfjpsiNoVertexing
     + hfjpsiNoVertexingNoOS