FastSim bug fix 8_0_X: fastSim era for Validation sequence, define DQM sequence for FastSim => *run physicsDQM*

Configuration/Applications/python/ConfigBuilder.py

@@ -1091,12 +1091,10 @@ def inGeometryKeys(opt):
 	if self._options.fast:
 		self.SIMDefaultCFF = 'FastSimulation.Configuration.SimIdeal_cff'
 		self.RECODefaultCFF= 'FastSimulation.Configuration.Reconstruction_AftMix_cff'
-                self.VALIDATIONDefaultCFF = "FastSimulation.Configuration.Validation_cff"
 		self.RECOBEFMIXDefaultCFF = 'FastSimulation.Configuration.Reconstruction_BefMix_cff'
 		self.RECOBEFMIXDefaultSeq = 'reconstruction_befmix'
 		self.L1RecoDefaultCFF='FastSimulation.Configuration.L1Reco_cff'
-
-
+                self.DQMOFFLINEDefaultCFF="FastSimulation.Configuration.DQMOfflineMC_cff"
 
         # Mixing
 	if self._options.pileup=='default':

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -542,14 +542,14 @@ 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,L1Reco,RECO,EI,HLT:@fake,VALIDATION',
+step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO,EI,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM',
                            '--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,L1Reco,RECO,EI,HLT:@relval25ns,VALIDATION',
+step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO,EI,HLT:@relval25ns,VALIDATION:@standardValidation,DQM:@standardDQM',
                            '--fast':'',
                            '--conditions'  :'auto:run2_mc',
                            '--beamspot'    : 'Realistic50ns13TeVCollision',

Configuration/StandardSequences/python/Validation_cff.py

@@ -45,6 +45,11 @@
                          *globalValidation
                          *hltvalidation)
 
+_validation_fastsim = validation.copy()
+for _entry in [globaldigisanalyze,globalhitsanalyze,globalrechitsanalyze]:
+    _validation_fastsim.remove(_entry)
+eras.fastSim.toReplaceWith(validation,_validation_fastsim)
+
 validationLiteTracking = cms.Sequence( validation )
 validationLiteTracking.replace(globalValidation,globalValidationLiteTracking)
 validationLiteTracking.remove(condDataValidation)

FastSimulation/Configuration/python/DQMOfflineMC_cff.py

@@ -0,0 +1,21 @@
+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 *
+from Validation.RecoTau.DQMSequences_cfi import *
+
+DQMOfflinePrePOG = cms.Sequence(
+    pvMonitor *
+    dqmPhysics *
+    produceDenoms *
+    pfTauRunDQMValidation
+    )
+
+DQMOffline = cms.Sequence(DQMOfflinePrePOG)
+PostDQMOffline = cms.Sequence()