Merge pull request #13030 from silviodonato/HLT-BTV-DQM-fix

DQM fixing after HLT b-tag renaming [BTV, SUSY]

DQM/HLTEvF/python/HLTObjectMonitor_cfi.py

@@ -28,10 +28,10 @@
 rsq_mr_pathName = "HLT_RsqMR240_Rsq0p09_MR200"
 rsq_mr_moduleName = "hltRsqMR240Rsq0p09MR200"
 
-bJet_pathNameCalo = "HLT_PFMET120_JetIdCleaned_BTagCSV0p72"
-bJet_moduleNameCalo = "hltBLifetimeL3FilterCSVsusy"
-bJet_pathNamePF = "HLT_QuadPFJet_SingleBTagCSV_VBF_Mqq500"
-bJet_moduleNamePF = "hltCSVPF0p78"
+bJet_pathNameCalo = "HLT_PFMET120_BTagCSV_p067"
+bJet_moduleNameCalo = "hltBTagCaloCSVp067Single"
+bJet_pathNamePF = "HLT_QuadPFJet_BTagCSV_p037_VBF_Mqq500"
+bJet_moduleNamePF = "hltBTagPFCSVp037SingleWithMatching"
 
 #To avoid booking histogram, set pathName = cms.string("")
 

DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py

@@ -19,7 +19,7 @@
     #
     pathPairs = cms.VPSet(
         cms.PSet(
-            pathname = cms.string("HLT_QuadPFJet_SingleBTagCSV_VBF"),
+            pathname = cms.string("HLT_QuadPFJet_BTagCSV_p037_VBF"),
             pathtype = cms.string("PF"),
         ),
         cms.PSet(

HLTriggerOffline/Btag/python/HltBtagPostValidation_cff.py

@@ -3,7 +3,7 @@
 #define HltBTagPostValidation for the b-tag DQM validation (efficiency and mistagrate plot)
 HltBTagPostValidation = cms.EDAnalyzer("HLTBTagHarvestingAnalyzer",
 	HLTPathNames = cms.vstring(
-	'HLT_PFMET120_NoiseCleaned_BTagCSV0p72_v',
+	'HLT_PFMET120_',
 	'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_',
 	'HLT_QuadPFJet_VBF',
 	'HLT_Ele32_eta2p1_',

HLTriggerOffline/Btag/python/HltBtagValidation_cff.py

@@ -4,7 +4,7 @@
 #denominator trigger
 hltBtagTriggerSelection = cms.EDFilter( "TriggerResultsFilter",
     triggerConditions = cms.vstring(
-      "HLT_PFMET120_NoiseCleaned_BTagCSV0p72_* OR HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_* OR HLT_QuadPFJet_VBF* OR HLT_Ele32_eta2p1_* OR HLT_IsoMu24_eta2p1_*"),
+      "HLT_PFMET120_* OR HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_* OR HLT_QuadPFJet_VBF* OR HLT_Ele32_eta2p1_* OR HLT_IsoMu24_eta2p1_*"),
     hltResults = cms.InputTag( "TriggerResults", "", "HLT" ),
 #    l1tResults = cms.InputTag( "simGtDigis" ),
     l1tResults = cms.InputTag( "gtDigis" ),
@@ -19,9 +19,9 @@
         SimVertexCollection = cms.InputTag("g4SimHits"),
 	TriggerResults = cms.InputTag('TriggerResults','',"HLT"),
 	HLTPathNames =cms.vstring(
-	'HLT_PFMET120_NoiseCleaned_BTagCSV0p72_v',
-	'HLT_PFMET120_NoiseCleaned_BTagCSV0p72_v',
-	'HLT_PFMET120_NoiseCleaned_BTagCSV0p72_v',
+	'HLT_PFMET120_',
+	'HLT_PFMET120_',
+	'HLT_PFMET120_',
 	'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_',
 	'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_',
 	'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_',
@@ -43,7 +43,7 @@
 hltbTagValidation = cms.EDAnalyzer("HLTBTagPerformanceAnalyzer",
 	TriggerResults = cms.InputTag('TriggerResults','','HLT'),
 	HLTPathNames =cms.vstring(
-	'HLT_PFMET120_NoiseCleaned_BTagCSV0p72_v',
+	'HLT_PFMET120_',
 	'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_',
 	'HLT_QuadPFJet_VBF',
 	'HLT_Ele32_eta2p1_',

HLTriggerOffline/Btag/test/config.ini

@@ -4,12 +4,11 @@ maxevents=-1
 processname=HLT
 hltjets=ak4GenJetsNoNu
 cmsswver= CMSSW_X_Y_Z
-files=
-       root://xrootd.ba.infn.it///store/relval/CMSSW_7_5_0_pre6/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/PU25ns_75X_mcRun2_asymptotic_v1-v1/00000/00DE8AFD-1D1C-E511-988E-0025905A612C.root
+files= root://xrootd.ba.infn.it///store/relval/CMSSW_7_5_0_pre6/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/PU25ns_75X_mcRun2_asymptotic_v1-v1/00000/00DE8AFD-1D1C-E511-988E-0025905A612C.root
 
 ;Paths names and btag variables that you want to monitor
 [btag]
-HLT_PFMET120_NoiseCleaned_BTagCSV0p72_v:
+HLT_PFMET120_:
 	hltCombinedSecondaryVertexBJetTagsCalo
 
 HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_:
@@ -27,7 +26,7 @@ HLT_IsoMu24_eta2p1_:
 ;Paths names and vertex variables that you want to monitor
 [vertex]
 
-HLT_PFMET120_NoiseCleaned_BTagCSV0p72_v:
+HLT_PFMET120_:
 	hltFastPrimaryVertex
 	hltFastPVPixelVertices
 	hltVerticesL3

HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_BTag_SingleLepton_cff.py

@@ -23,7 +23,7 @@
 
                                                    hltProcess = cms.string('HLT'),
 
-                                                   triggerPath = cms.string('HLT_Ele15_IsoVVVL_BTagCSV0p72_PFHT400'),
+                                                   triggerPath = cms.string('HLT_Ele15_IsoVVVL_BTagCSV_p067_PFHT400'),
                                                    triggerPathAuxiliary = cms.string('HLT_Ele35_eta2p1_WP85_Gsf_v'),
                                                    triggerPathLeptonAuxiliary = cms.string('HLT_PFHT350_PFMET120_NoiseCleaned_v'),
 
@@ -43,7 +43,7 @@
                                                    )
 
 SUSY_HLT_Ele_HT_BTag_SingleLepton_POSTPROCESSING = cms.EDAnalyzer('DQMGenericClient',
-                                                                  subDirs = cms.untracked.vstring('HLT/SUSYBSM/HLT_Ele15_IsoVVVL_BTagCSV0p72_PFHT400'),
+                                                                  subDirs = cms.untracked.vstring('HLT/SUSYBSM/HLT_Ele15_IsoVVVL_BTagCSV_p067_PFHT400'),
                                                                   efficiency = cms.vstring(
         "leptonTurnOn_eff ';Offline Electron p_{T} [GeV];#epsilon' leptonTurnOn_num leptonTurnOn_den",
         "pfHTTurnOn_eff ';Offline PF H_{T} [GeV];#epsilon' pfHTTurnOn_num pfHTTurnOn_den",

HLTriggerOffline/SUSYBSM/python/SUSYBSM_HLT_Electron_BJet_cff.py

@@ -7,7 +7,7 @@
   caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'), #to use with test sample
   HLTProcess = cms.string('HLT'),
-  TriggerPath = cms.string('HLT_Ele10_CaloIdM_TrackIdM_CentralPFJet30_BTagCSV0p54PF_v'),
+  TriggerPath = cms.string('HLT_Ele10_CaloIdM_TrackIdM_CentralPFJet30_BTagCSV_p13_v'),
   TriggerFilterEle = cms.InputTag('hltSingleEle10CaloIdTrackIdVLDphiFilter', '', 'HLT'), #the last filter in the path hltSingleEle10CaloIdTrackIdVLOneOEMinusOneOPFilterRegional
   TriggerFilterJet = cms.InputTag('hltCSVFilterSingleEle10', '', 'HLT'), #the last filter in the path
   PtThrJet = cms.untracked.double(40.0),

HLTriggerOffline/SUSYBSM/python/SUSYBSM_HLT_Muon_BJet_cff.py

@@ -7,7 +7,7 @@
   caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'), #to use with test sample
   HLTProcess = cms.string('HLT'),
-  TriggerPath = cms.string('HLT_Mu10_CentralPFJet30_BTagCSV0p54PF_v'),
+  TriggerPath = cms.string('HLT_Mu10_CentralPFJet30_BTagCSV_p13_v'),
   TriggerFilterMuon = cms.InputTag('hltL3fL1sMu16L1f0L2f3QL3Filtered10Q', '','HLT'),
   TriggerFilterJet = cms.InputTag('hltCSVFilterSingleMu10', '', 'HLT'), #the last filter in the path
   PtThrJet = cms.untracked.double(40.0),

HLTriggerOffline/SUSYBSM/python/SUSYBSM_MET_BTAG_cff.py

@@ -6,15 +6,15 @@
   pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
   caloJetCollection = cms.InputTag("ak4CaloJets"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
-  TriggerPath = cms.string('HLT_PFMET120_BTagCSV0p72_v'),
+  TriggerPath = cms.string('HLT_PFMET120_BTagCSV_p067_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
   TriggerFilter = cms.InputTag('hltPFMET120Filter', '', 'HLT'), #the last filter in the path
   PtThrJet = cms.untracked.double(40.0),
   EtaThrJet = cms.untracked.double(3.0)
 )
 
 SUSY_HLT_MET_BTAG_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
-  subDirs = cms.untracked.vstring("HLT/SUSYBSM/HLT_PFMET120_BTagCSV0p72"),
+  subDirs = cms.untracked.vstring("HLT/SUSYBSM/HLT_PFMET120_BTagCSV_p067_v"),
   efficiency = cms.vstring(
     "pfMetTurnOn_eff 'Efficiency vs PFMET' pfMetTurnOn_num pfMetTurnOn_den",
     "pfHTTurnOn_eff 'Efficiency vs PFHT' pfHTTurnOn_num pfHTTurnOn_den"

HLTriggerOffline/SUSYBSM/python/SUSYBSM_MET_HT_MUON_BTAG_cff.py

@@ -10,7 +10,7 @@
   TriggerResults = cms.InputTag('TriggerResults','','HLT'), #to use with test sample
   #TriggerResults = cms.InputTag('TriggerResults','','HLT'),
   HLTProcess = cms.string('HLT'),
-  TriggerPath = cms.string('HLT_Mu6_PFHT200_PFMET80_BTagCSV0p72_v'),
+  TriggerPath = cms.string('HLT_Mu6_PFHT200_PFMET80_BTagCSV_p067_v'),
   TriggerPathAuxiliaryForMuon = cms.string('HLT_PFHT900_v'),
   TriggerPathAuxiliaryForHadronic = cms.string('HLT_IsoMu24_eta2p1_IterTrk02_v'),
   TriggerFilter = cms.InputTag('hltMu6PFHT200PFMET125L3PreFiltered', '', 'HLT'), #the last filter in the path
@@ -24,7 +24,7 @@
 
 
 SUSY_HLT_MET_HT_MUON_BTAG_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
-    subDirs        = cms.untracked.vstring("HLT/SUSYBSM/HLT_Mu6_PFHT200_PFMET80_BTagCSV0p72"),
+    subDirs        = cms.untracked.vstring("HLT/SUSYBSM/HLT_Mu6_PFHT200_PFMET80_BTagCSV_p067_v"),
     verbose        = cms.untracked.uint32(2), # Set to 2 for all messages
     resolution     = cms.vstring(""),
     efficiency     = cms.vstring(

HLTriggerOffline/SUSYBSM/python/SUSYBSM_Mu_HT_BTag_SingleLepton_cff.py

@@ -23,7 +23,7 @@
 
                                                   hltProcess = cms.string('HLT'),
 
-                                                  triggerPath = cms.string('HLT_Mu15_IsoVVVL_BTagCSV0p72_PFHT400'),
+                                                  triggerPath = cms.string('HLT_Mu15_IsoVVVL_BTagCSV_p067_PFHT400'),
                                                   triggerPathAuxiliary = cms.string('HLT_IsoMu27_v'),
                                                   triggerPathLeptonAuxiliary = cms.string('HLT_PFHT350_PFMET120_NoiseCleaned_v'),
 
@@ -43,7 +43,7 @@
                                                   )
 
 SUSY_HLT_Mu_HT_BTag_SingleLepton_POSTPROCESSING = cms.EDAnalyzer('DQMGenericClient',
-                                                                 subDirs = cms.untracked.vstring('HLT/SUSYBSM/HLT_Mu15_IsoVVVL_BTagCSV0p72_PFHT400'),
+                                                                 subDirs = cms.untracked.vstring('HLT/SUSYBSM/HLT_Mu15_IsoVVVL_BTagCSV_p067_PFHT400'),
                                                                  efficiency = cms.vstring(
         "leptonTurnOn_eff ';Offline Muon p_{T} [GeV];#epsilon' leptonTurnOn_num leptonTurnOn_den",
         "pfHTTurnOn_eff ';Offline PF H_{T} [GeV];#epsilon' pfHTTurnOn_num pfHTTurnOn_den",

HLTriggerOffline/SUSYBSM/python/SUSYBSM_Razor_cff.py

@@ -5,7 +5,7 @@
   METCollection = cms.InputTag("pfMet"),
   jetCollection = cms.InputTag("ak4PFJetsCHS"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
-  TriggerPath = cms.string('HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoublePFBTagCSV0p7_Mbb60_200_v'),
+  TriggerPath = cms.string('HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoubleBTagCSV_p063_Mbb60_200_v'),
   TriggerFilter = cms.InputTag('hltRsq0p02MR300', '', 'HLT'), #the last filter in the path
   CaloFilter = cms.InputTag('hltMR200Calo', '', 'HLT'), #filter implementing cuts on calo MR and Rsq
   hemispheres = cms.InputTag('hemispheres')
@@ -16,7 +16,7 @@
   METCollection = cms.InputTag("pfMet"),
   jetCollection = cms.InputTag("ak4PFJetsCHS"),
   TriggerResults = cms.InputTag('TriggerResults','','HLT'),
-  TriggerPath = cms.string('HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoublePFBTagCSV0p7_0p4_Mbb60_200_v'),
+  TriggerPath = cms.string('HLT_Rsq0p02_MR300_TriPFJet80_60_40_BTagCSV_p063_p20_Mbb60_200_v'),
   TriggerFilter = cms.InputTag('hltRsq0p02MR300', '', 'HLT'), #the last filter in the path
   CaloFilter = cms.InputTag('hltMR200Calo', '', 'HLT'), #filter implementing cuts on calo MR and Rsq
   hemispheres = cms.InputTag('hemispheres')
@@ -177,7 +177,7 @@
 )
 
 SUSY_HLT_Razor_PostVal_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
-    subDirs        = cms.untracked.vstring("HLT/SUSYBSM/HLT_RsqMR300_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR300_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_Rsq0p36", "HLT/SUSYBSM/HLT_RsqMR270_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR270_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_Rsq0p30", "HLT/SUSYBSM/HLT_RsqMR260_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR260_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_Rsq0p25", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200_Calo", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200_4jet_Calo", "HLT/SUSYBSM/HLT_Rsq0p25_Calo", "HLT/SUSYBSM/HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoublePFBTagCSV0p7_0p4_Mbb60_200", "HLT/SUSYBSM/HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoublePFBTagCSV0p7_Mbb60_200"),
+    subDirs        = cms.untracked.vstring("HLT/SUSYBSM/HLT_RsqMR300_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR300_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_Rsq0p36", "HLT/SUSYBSM/HLT_RsqMR270_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR270_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_Rsq0p30", "HLT/SUSYBSM/HLT_RsqMR260_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR260_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200_4jet", "HLT/SUSYBSM/HLT_Rsq0p25", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200_Calo", "HLT/SUSYBSM/HLT_RsqMR240_Rsq0p09_MR200_4jet_Calo", "HLT/SUSYBSM/HLT_Rsq0p25_Calo", "HLT/SUSYBSM/HLT_Rsq0p02_MR300_TriPFJet80_60_40_BTagCSV_p063_p20_Mbb60_200", "HLT/SUSYBSM/HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoubleBTagCSV_p063_Mbb60_200"),
     verbose        = cms.untracked.uint32(2), # Set to 2 for all messages
     resolution     = cms.vstring(""),
     efficiency     = cms.vstring(

HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_cff.py

@@ -317,7 +317,7 @@
       "HLT_PFHT900_v",
       "HLT_PFHT350_PFMET120_NoiseCleaned_v",
       "HLT_PFMET170_NoiseCleaned_v",
-      "HLT_PFMET120_NoiseCleaned_BTagCSV07_v"
+      "HLT_PFMET120_BTagCSV_p067_v"
     ),
     muonTag = cms.InputTag('muons'),
     histoFileName = cms.untracked.string('MonElements_LM1_IDEAL_30x_v1_300pre7.root'),

HLTriggerOffline/SUSYBSM/python/SUSYBSM_triggerValidation_fastSim_cff.py

@@ -315,7 +315,7 @@
       "HLT_PFHT900_v",
       "HLT_PFHT350_PFMET120_NoiseCleaned_v",
       "HLT_PFMET170_NoiseCleaned_v",
-      "HLT_PFMET120_NoiseCleaned_BTagCSV07_v"
+      "HLT_PFMET120_BTagCSV_p067_v"
     ),
     muonTag = cms.InputTag('muons'),
     histoFileName = cms.untracked.string('MonElements_LM1_IDEAL_30x_v1_300pre7.root'),