Merge pull request #23771 from anovak10/testVal

Fixing HLTOffline BTV Validation
cms-sw · Jul 19, 2018 · d16de0c · d16de0c
2 parents e569679 + bd82190
commit d16de0c
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 18 deletions.
diff --git a/HLTriggerOffline/Btag/python/HltBtagPostValidation_cff.py b/HLTriggerOffline/Btag/python/HltBtagPostValidation_cff.py
@@ -9,14 +9,18 @@
 	'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_v',
 	'HLT_PFHT380_SixPFJet32_DoublePFBTagCSV_',
 	'HLT_PFHT380_SixPFJet32_DoublePFBTagDeepCSV_',
-	'HLT_IsoMu24_eta2p1_v'
+	'HLT_IsoMu24_eta2p1_v',
+	'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5',
+	'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_CaloDiJet30_CaloBtagDeepCSV_1p5'
 	),
 	histoName	= cms.vstring(
-	'hltCombinedSecondaryVertexBJetTagsCalo',
-	'hltCombinedSecondaryVertexBJetTagsCalo',
-	'hltCombinedSecondaryVertexBJetTagsCalo',
-	'hltCombinedSecondaryVertexBJetTagsPF',
-	'hltCombinedSecondaryVertexBJetTagsPF',
+	'hltDeepCombinedSecondaryVertexBJetTagsCalo',
+	'hltDeepCombinedSecondaryVertexBJetTagsCalo',
+	'hltDeepCombinedSecondaryVertexBJetTagsCalo',
+	'hltDeepCombinedSecondaryVertexBJetTagsPF',
+	'hltDeepCombinedSecondaryVertexBJetTagsPF',
+	'hltDeepCombinedSecondaryVertexBJetTagsPF',
+	'hltDeepCombinedSecondaryVertexBJetTagsCalo',
 	),
 	minTag	= cms.double(0.6),
 	# MC stuff

diff --git a/HLTriggerOffline/Btag/python/HltBtagValidation_cff.py b/HLTriggerOffline/Btag/python/HltBtagValidation_cff.py
@@ -31,7 +31,9 @@
 	'HLT_PFHT380_SixPFJet32_DoublePFBTagCSV_',
 	'HLT_PFHT380_SixPFJet32_DoublePFBTagCSV_',
 	'HLT_PFHT380_SixPFJet32_DoublePFBTagDeepCSV_',
-	'HLT_IsoMu24_eta2p1_v'
+	'HLT_IsoMu24_eta2p1_v',
+	'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5',
+	'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_CaloDiJet30_CaloBtagDeepCSV_1p5'
 	),
 	Vertex = cms.VInputTag(
 		cms.InputTag("hltVerticesL3"), 
@@ -50,14 +52,18 @@
 	'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_v',
 	'HLT_PFHT380_SixPFJet32_DoublePFBTagCSV_',
 	'HLT_PFHT380_SixPFJet32_DoublePFBTagDeepCSV_',
-	'HLT_IsoMu24_eta2p1_v'
+	'HLT_IsoMu24_eta2p1_v',
+	'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5',
+	'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_CaloDiJet30_CaloBtagDeepCSV_1p5'
 	),
 	JetTag = cms.VInputTag(
-		cms.InputTag("hltCombinedSecondaryVertexBJetTagsCalo"),
-		cms.InputTag("hltCombinedSecondaryVertexBJetTagsCalo"),
-		cms.InputTag("hltCombinedSecondaryVertexBJetTagsCalo"),
-		cms.InputTag("hltCombinedSecondaryVertexBJetTagsPF"),
-		cms.InputTag("hltCombinedSecondaryVertexBJetTagsPF"),
+		cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsCalo", "probb"),
+		cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsCalo", "probb"),
+		cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsCalo", "probb"),
+		cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsPF", "probb"),
+		cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsPF", "probb"),
+		cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsPF", "probb"),
+		cms.InputTag("hltDeepCombinedSecondaryVertexBJetTagsCalo", "probb"),
 		),
 	MinJetPT = cms.double(20),
 	mcFlavours = cms.PSet(

diff --git a/HLTriggerOffline/Btag/test/testSequences.py b/HLTriggerOffline/Btag/test/testSequences.py
@@ -10,11 +10,35 @@
 
 process.DQM_BTag = cms.Path(    process.hltbtagValidationSequence + process.HltBTagPostVal + process.dqmSaver)
 
-
-process.source = cms.Source("PoolSource",
-	fileNames = cms.untracked.vstring("root://cms-xrd-global.cern.ch//store/relval/CMSSW_8_1_0_pre7/RelValTTbar_13/GEN-SIM-DIGI-RAW-HLTDEBUG/81X_mcRun2_asymptotic_v0-v1/10000/1E660EDB-F135-E611-9E57-0CC47A4D76C8.root")
-#	fileNames = cms.untracked.vstring("file:RelVal750pre3.root")
-)
+import sys
+import Utilities.General.cmssw_das_client as cmssw_das_client
+def add_rawRelVals(process, inputName):   
+   query='dataset='+inputName 
+   dataset = cmssw_das_client.get_data(query, limit = 0)
+   if not dataset:
+      raise RuntimeError(
+         'Das returned no dataset parent of the input file: %s \n'
+         'The parenthood is needed to add RAW secondary input files' % process.source.fileNames[0]
+         )
+   for i in dataset['data']:
+	try: n_files = i['dataset'][0]['num_file']
+	except: pass
+   raw_files = cmssw_das_client.get_data('file '+query, limit = 0)
+   files = []
+   for i in raw_files['data']:
+	files.append( i['file'][0]['name'])
+
+   raw_files = ['root://cms-xrd-global.cern.ch/'+str(i) for i in files]
+   process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring(raw_files))
+   return process
+
+add_rawRelVals(process, str(sys.argv[-1]))
+
+#process.source = cms.Source("PoolSource",
+#	fileNames = cms.untracked.vstring(
+#'root://cms-xrd-global.cern.ch//store/relval/CMSSW_10_2_0_pre6/RelValTTbar_13/GEN-SIM-DIGI-RAW/102X_upgrade2018_realistic_v7-v1/10000/103778EC-A27B-E811-8D04-0CC47A4D76AA.root',
+#)
+#)