Merge pull request #28351 from jfernan2/fixZeroBias

Fix DQM ZB workflows and moved DQM FS configuration to DQM package
cms-sw · Nov 23, 2019 · 7e27750 · 7e27750
2 parents 8d6e9d8 + b242359
commit 7e27750
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 28 deletions.
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -1110,7 +1110,7 @@ def inGeometryKeys(opt):
             self.RECOBEFMIXDefaultCFF = 'FastSimulation.Configuration.Reconstruction_BefMix_cff'
             self.RECOBEFMIXDefaultSeq = 'reconstruction_befmix'
             self.NANODefaultSeq = 'nanoSequenceFS'
-            self.DQMOFFLINEDefaultCFF="FastSimulation.Configuration.DQMOfflineMC_cff"
+            self.DQMOFFLINEDefaultCFF="DQMOffline.Configuration.DQMOfflineFS_cff"
 
         # Mixing
         if self._options.pileup=='default':
@@ -1915,7 +1915,7 @@ def renameHLTprocessInSequence(self,sequence,proc=None,HLTprocess='HLT'):
 
 
     def expandMapping(self,seqList,mapping,index=None):
-        maxLevel=25
+        maxLevel=30
         level=0
         while '@' in repr(seqList) and level<maxLevel:
             level+=1

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -960,15 +960,15 @@ def genS(fragment,howMuch):
 #### fastsim section ####
 ##no forseen to do things in two steps GEN-SIM then FASTIM->end: maybe later
 #step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM',
-step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
+step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
                            '--fast':'',
                            '--beamspot'    : 'Realistic8TeVCollision',
                            '--eventcontent':'FEVTDEBUGHLT,DQM',
                            '--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
                            '--relval':'27000,3000'},
                           step1Defaults])
 #step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@relval2016,VALIDATION:@standardValidation,DQM:@standardDQM',
-step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
+step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
                            '--fast':'',
                            '--conditions'  :'auto:run2_mc',
                            '--beamspot'    : 'Realistic50ns13TeVCollision',
@@ -984,7 +984,7 @@ def genS(fragment,howMuch):
 step1FastUpg2015_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
                                                 step1FastUpg2015Defaults])
 
-step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
+step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
                            '--fast':'',
                            '--conditions'  :'auto:phase1_2017_realistic',
                            '--beamspot'    : 'Realistic25ns13TeVEarly2017Collision',
@@ -1000,7 +1000,7 @@ def genS(fragment,howMuch):
 step1FastUpg2017_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
                                                 step1FastUpg2017Defaults])
 
-step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
+step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
                            '--fast':'',
                            '--conditions'  :'auto:phase1_2018_realistic',
                            '--beamspot'    :'Realistic25ns13TeVEarly2018Collision',
@@ -2547,7 +2547,7 @@ def gen2018HiMix(fragment,howMuch):
 
 
 #data
-steps['HARVESTD']={'-s':'HARVESTING:@standardDQM+@ExtraHLT+@miniAODDQM',
+steps['HARVESTD']={'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM',
                    '--conditions':'auto:run1_data',
                    '--data':'',
                    '--filetype':'DQM',

diff --git a/.../Configuration/python/DQMOfflineMC_cff.py → .../Configuration/python/DQMOfflineFS_cff.py b/.../Configuration/python/DQMOfflineMC_cff.py → .../Configuration/python/DQMOfflineFS_cff.py
@@ -1,10 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 # FastSim version of DQMOffline/Configuration/python/DQMOfflineMC_cff.py .
-# On long term FastSim should actually use DQMOffline/Configuration/python/DQMOfflineMC_cff.py, 
-# with fastsim modifications applied via fastSim era.
-# For now this is too much of a hassle because DQMOffline/Configuration/python/DQMOfflineMC_cff.py is a bit of a mess.
-# Therefore we define here a FastSim specific DQM sequence with only the most relevant modules, and/or the ones that don't cause too much headache
 
 from DQMOffline.RecoB.PrimaryVertexMonitor_cff import *
 from DQM.Physics.DQMPhysics_cff import *
@@ -25,5 +21,5 @@
 singleTopMuonMediumDQM.setup.jetExtras.jetCorrector = cms.InputTag("ak4PFCHSL1FastL2L3Corrector")
 singleTopElectronMediumDQM.setup.jetExtras.jetCorrector = cms.InputTag("ak4PFCHSL1FastL2L3Corrector")
 
-DQMOffline = cms.Sequence(DQMOfflinePrePOG)
+DQMOfflineFS = cms.Sequence(DQMOfflinePrePOG)
 PostDQMOffline = cms.Sequence()
diff --git a/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py b/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py
@@ -45,5 +45,6 @@
     sipixelCertification # segfaults when included
 ]))
 
+
 DQMCertCommonFakeHLT = cms.Sequence( DQMCertCommon )
 DQMCertCommonFakeHLT.remove( dqmOfflineTriggerCert )
diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -152,7 +152,7 @@
 DQMOfflineTAU = cms.Sequence( produceDenomsData *
 				pfTauRunDQMValidation )
 
-DQMOfflineTrackerStrip = cms.Sequence( SiStripDQMTier0Common )
+DQMOfflineTrackerStripCommon = cms.Sequence( SiStripDQMTier0Common )
 
 DQMOfflineTrackerPixel = cms.Sequence( siPixelOfflineDQM_source )
 

diff --git a/DQMOffline/Configuration/python/autoDQM.py b/DQMOffline/Configuration/python/autoDQM.py
@@ -1,18 +1,22 @@
-autoDQM = { 'common': ['@dcs+DQMMessageLoggerSeq+@strip+@pixel+@tracking+@L1TMon+@hlt+@beam+@castor+@physics+@tau',
+autoDQM = { 'DQMMessageLogger': ['DQMMessageLoggerSeq',
+                              'PostDQMOffline',
+                              'DQMMessageLoggerClientSeq'],
+
+            'common': ['@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@L1TMon+@hlt+@beam+@castor+@physics+@tau',
                         'PostDQMOffline',
-                        '@dcs+DQMMessageLoggerClientSeq+@strip+@pixel+@tracking+@L1TMon+@hlt+@beam+@fed+@tau+dqmFastTimerServiceClient'],
+                        '@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@L1TMon+@hlt+@beam+@fed+@tau+dqmFastTimerServiceClient'],
 
-            'commonFakeHLT': ['@dcs+DQMMessageLoggerSeq+@strip+@pixel+@tracking+@L1TMon+@beam+@castor+@physics+@tau',
+            'commonFakeHLT': ['@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@L1TMon+@beam+@castor+@physics+@tau',
                         'PostDQMOffline',
-                        '@dcs+DQMMessageLoggerClientSeq+@strip+@pixel+@tracking+@L1TMon+@beam+@fed+@tau+dqmFastTimerServiceClient'],
+                        '@dcs+@DQMMessageLoggerClient+@stripCommon+@pixel+@tracking+@L1TMon+@beam+@fed+@tau+dqmFastTimerServiceClient'],
 
-            'commonSiStripZeroBias': ['@dcs+DQMMessageLoggerSeq+DQMOfflineCommonSiStripZeroBias+@tracking+@L1TMon+@hlt+@beam+@castor+@physics',
+            'commonSiStripZeroBias': ['@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@hlt+@beam+@castor+@physics',
                                       'PostDQMOffline',
-                                      '@dcs+DQMMessageLoggerClientSeq+DQMHarvestCommonSiStripZeroBias+@tracking+@L1TMon+@hlt+@beam+@fed+dqmFastTimerServiceClient'],
+                                      '@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@hlt+@beam+@fed+dqmFastTimerServiceClient'],
 
-            'commonSiStripZeroBiasFakeHLT': ['@dcs+DQMMessageLoggerSeq+DQMOfflineCommonSiStripZeroBiasFakeHLT+@tracking+@L1TMon+@beam+@castor+@physics',
+            'commonSiStripZeroBiasFakeHLT': ['@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@beam+@castor+@physics',
                                       'PostDQMOffline',
-                                      '@dcs+DQMMessageLoggerClientSeq+DQMHarvestCommonSiStripZeroBiasFakeHLT+@tracking+@L1TMon+@beam+@fed+dqmFastTimerServiceClient'],
+                                      '@dcs+@DQMMessageLogger+@stripZeroBias+@pixelOnlyDQM+@trackingZeroBias+@L1TMon+@beam+@fed+dqmFastTimerServiceClient'],
 
             'trackingOnlyDQM': ['DQMOfflineTracking',
                                 'PostDQMOffline',
@@ -34,6 +38,10 @@
 		      'PostDQMOffline',
 		      'DQMHarvestTrackerStrip+DQMCertTrackerStrip'],
 
+            'stripCommon': ['DQMOfflineTrackerStripCommon',
+                      'PostDQMOffline',
+                      'DQMHarvestTrackerStrip+DQMCertTrackerStrip'],
+
 	    'stripZeroBias': ['DQMOfflineTrackerStripMinBias',
 			      'PostDQMOffline',
                               'DQMHarvestTrackerStrip+DQMCertTrackerStrip'],
@@ -42,6 +50,10 @@
 		      'PostDQMOffline',
                       'DQMHarvestTrackerPixel+DQMCertTrackerPixel'],
 
+            'pixelOnlyDQM': ['DQMOfflineTrackerPixel',
+                      'PostDQMOffline',
+                      'DQMHarvestTrackerPixel'],
+
 	    'castor': ['DQMOfflineCASTOR',
 		       'PostDQMOffline',
 		       'DQMNone'],
@@ -50,6 +62,10 @@
 			 'PostDQMOffline',
                          'DQMHarvestTracking+DQMCertTracking'],
 
+            'trackingZeroBias': ['DQMOfflineTrackingMinBias',
+                       'PostDQMOffline',
+                       'DQMHarvestTracking+DQMCertTracking'],
+
 	    'hlt': ['DQMOfflineTrigger',
 		    'PostDQMOffline',
                     'DQMHarvestTrigger+DQMCertTrigger'],
@@ -162,23 +178,23 @@
                       'PostDQMOffline',
                       'DQMHarvestPF'],
 
+#            'standardDQM': ['@dcs+@DQMMessageLogger+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@hlt+@btag+@beam+@physics+@HLTMon',
              'standardDQM': ['DQMOffline',
                             'PostDQMOffline',
                             'dqmHarvesting'],
-#            'standardDQM': ['@dcs+DQMMessageLoggerSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@hlt+@btag+@beam+@physics+@HLTMon',
-#                            'PostDQMOffline',
-#                            '@dcs+DQMMessageLoggerClientSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@fed+@muon+@tracking+@jetmet+@egamma+@L1TMon+@hlt+@btag+@beam+@HLTMon'],
+
+            'standardDQMFS': ['DQMOfflineFS',
+                            'PostDQMOffline',
+                            'dqmHarvesting'],
 
             'ExtraHLT': ['DQMOfflineExtraHLT',
                          'PostDQMOffline',
                          'dqmHarvestingExtraHLT'],
 
-            'standardDQMFakeHLT': ['DQMOfflineFakeHLT',
+#            'standardDQMFakeHLT': ['@dcs+@DQMMessageLogger+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@btag+@beam+@physics',
+             'standardDQMFakeHLT': ['DQMOfflineFakeHLT',
                                    'PostDQMOffline',
                                    'dqmHarvestingFakeHLT'],
-#            'standardDQMFakeHLT': ['@dcs+DQMMessageLoggerSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@castor+@ctpps+@muon+@tracking+@jetmet+@egamma+@L1TMon+@btag+@beam+@physics',
-#                                   'PostDQMOffline',
-#                                   '@dcs+DQMMessageLoggerClientSeq+@ecal+@hcal+@hcal2+@strip+@pixel+@fed+@muon+@tracking+@jetmet+@egamma+@L1TMon+@btag+@beam'],
 
             'standardDQMHIFakeHLT': ['DQMOfflineHeavyIonsFakeHLT',
                                    'PostDQMOfflineHI',