first commit to add an EndPath in DQM sequence

(cherry picked from commit 1bcef64)
carolhungwt · Jan 21, 2016 · 0541887 · 0541887
1 parent f40c5e8
commit 0541887
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -1922,14 +1922,16 @@ def prepare_DQM(self, sequence = 'DQMOffline'):
 
         self.loadDefaultOrSpecifiedCFF(sequence,self.DQMOFFLINEDefaultCFF)
         sequenceList=sequence.split('.')[-1].split('+')
+        postSequenceList=sequence.split('.')[-1].split('+')
 	from DQMOffline.Configuration.autoDQM import autoDQM
 	self.expandMapping(sequenceList,autoDQM,index=0)
+	self.expandMapping(postSequenceList,autoDQM,index=1)
 
 	if len(set(sequenceList))!=len(sequenceList):
 		sequenceList=list(set(sequenceList))
 		print "Duplicate entries for DQM:, using",sequenceList
+
 	pathName='dqmoffline_step'
-
 	for (i,sequence) in enumerate(sequenceList):
 		if (i!=0):
 			pathName='dqmoffline_%d_step'%(i)
@@ -1946,6 +1948,19 @@ def prepare_DQM(self, sequence = 'DQMOffline'):
 			setattr(self.process,pathName, cms.Path( getattr(self.process, sequence) ) ) 
 		self.schedule.append(getattr(self.process,pathName))
 
+	pathName='dqmoffline_endstep'
+	for (i,sequence) in enumerate(postSequenceList):
+                if (i!=0):
+                        pathName='dqmoffline_%d_endstep'%(i)
+
+		# if both MINIAOD and DQM are run in the same process, schedule DQM in an EndPath
+		if 'PAT' in self.stepMap.keys():
+			# need to put DQM in an EndPath, to access the miniAOD filter results
+			setattr(self.process,pathName, cms.EndPath( getattr(self.process, sequence ) ) )
+		else:
+			# schedule DQM as a standard Path
+			setattr(self.process,pathName, cms.Path( getattr(self.process, sequence) ) )
+		self.schedule.append(getattr(self.process,pathName))
 
     def prepare_HARVESTING(self, sequence = None):
         """ Enrich the process with harvesting step """

diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -131,4 +131,7 @@
 
 DQMOfflineBTag = cms.Sequence( bTagPlotsDATA )
 
-DQMOfflineMiniAOD = cms.Sequence( miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD )
+DQMOfflineMiniAOD = cms.Sequence()
+
+DQMOfflineMiniAODEndPath = cms.Sequence(miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD)
+DQMOfflineEndPath = cms.Sequence()
diff --git a/DQMOffline/Configuration/python/autoDQM.py b/DQMOffline/Configuration/python/autoDQM.py
@@ -22,9 +22,10 @@
                               '@commonSiStripZeroBias+@muon+@hcal+@jetmet+@ecal'],
             'allForPrompt':  ['@common+@muon+@hcal+@jetmet+@ecal',
                               '@common+@muon+@hcal+@jetmet+@ecal'],
-            'miniAODDQM': ['DQMOfflineMiniAOD',
-                           'DQMHarvestMiniAOD'],
-            'standardDQM': ['DQMOffline',
+
+            'miniAODDQM': ['DQMOfflineMiniAOD','DQMOfflineMiniAODEndPath',
+                        'DQMHarvestMiniAOD'],
+            'standardDQM': ['DQMOffline','DQMOfflineEndPath',
                             'dqmHarvesting'],
             'standardDQMFakeHLT': ['DQMOfflineFakeHLT',
                                    'dqmHarvestingFakeHLT']