62 xhl tand t ps

Configuration/Applications/python/ConfigBuilder.py

@@ -1352,6 +1352,9 @@ def prepare_DIGI(self, sequence = None):
         if self._options.himix==True:
             self.loadAndRemember("SimGeneral/MixingModule/himixDIGI_cff")
 
+        if sequence == 'pdigi_valid':
+            self.executeAndRemember("process.mix.digitizers = cms.PSet(process.theDigitizersValid)")
+
 	self.scheduleSequence(sequence.split('.')[-1],'digitisation_step')
         return
 

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -884,14 +884,13 @@ def genvalid(fragment,d,suffix='all',fi=''):
 
 
 # step2 
-step2Defaults = { 
-                  '-s'            : 'DIGI,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco',
+step2Defaults = { '-s'            : 'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco',
                   '--datatier'    : 'GEN-SIM-DIGI-RAW-HLTDEBUG',
                   '--eventcontent': 'FEVTDEBUGHLT',
                   '--conditions'  : 'auto:startup',
                   }
 #for 2015
-step2Upg2015Defaults = {'-s'     :'DIGI,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco',
+step2Upg2015Defaults = {'-s'     :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco',
                  '--conditions'  :'auto:upgradePLS1', 
                  # '--magField'    : '38T_PostLS1',   #activate when 6_2_0_patch1 GEN-SIM will be available ( 6_2_0_pre8 GEN-SIM don't have 38T_PostLS1)
                  '--datatier'    :'GEN-SIM-DIGI-RAW',
@@ -902,7 +901,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
                   }
 steps['DIGIUP15']=merge([step2Upg2015Defaults]) # todo: remove UP from label
 
-steps['DIGIPROD1']=merge([{'--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Defaults])
+steps['DIGIPROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Defaults])
 steps['DIGI']=merge([step2Defaults])
 #steps['DIGI2']=merge([stCond,step2Defaults])
 steps['DIGICOS']=merge([{'--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW'},stCond,step2Defaults])
@@ -917,12 +916,12 @@ def genvalid(fragment,d,suffix='all',fi=''):
 steps['RESIMDIGI']=merge([{'-s':'reGEN,reSIM,DIGI,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco','-n':10,'--restoreRNDSeeds':'','--process':'HLT'},steps['DIGI']])
 
 
-steps['DIGIHI']=merge([{'--conditions':'auto:starthi_HIon', '-s':'DIGI,L1,DIGI2RAW,HLT:HIon,RAW2DIGI,L1Reco', '--inputCommands':'"keep *","drop *_simEcalPreshowerDigis_*_*"', '-n':10}, hiDefaults, step2Defaults])
+steps['DIGIHI']=merge([{'--conditions':'auto:starthi_HIon', '-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:HIon,RAW2DIGI,L1Reco', '--inputCommands':'"keep *","drop *_simEcalPreshowerDigis_*_*"', '-n':10}, hiDefaults, step2Defaults])
 
 #wmsplit['DIGIHI']=5
 
 #for pix phase1
-step2Upgpixphase1Defaults = {'-s':'DIGI,L1,DIGI2RAW',
+step2Upgpixphase1Defaults = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW',
                  '--conditions':'DESIGN61_V10::All', #to be updtaed with autocond
                  '--datatier':'GEN-SIM-DIGI-RAW',
                  '-n':'10',
@@ -933,7 +932,7 @@ def genvalid(fragment,d,suffix='all',fi=''):
 steps['DIGIUP']=merge([step2Upgpixphase1Defaults])
 
 #for 2017
-step2Upg2017Defaults = {'-s':'DIGI,L1,DIGI2RAW',
+step2Upg2017Defaults = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW',
                  '--conditions':'auto:upgradePLS1', 
                  '--datatier':'GEN-SIM-DIGI-RAW',
                  '-n':'10',

Configuration/StandardSequences/python/Digi_cff.py

@@ -27,4 +27,4 @@
 doAllDigi = cms.Sequence(calDigi+muonDigi)
 pdigi = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi*addPileupInfo)
 
-
+pdigi_valid = cms.Sequence(pdigi)

HLTrigger/Configuration/test/cmsDriver.csh

@@ -148,7 +148,7 @@ foreach gtag ( STARTUP DATA )
 
     echo
     echo "Creating DigiL1RawHLT $name"
-    cmsDriver.py RelVal                --step=DIGI,L1,DIGI2RAW,$XHLT               --conditions=$GTAG --filein=$InputGenSim                        --custom_conditions=$XL1T  --fileout=RelVal_DigiL1RawHLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW-HLT'  --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT  --scenario=$SCEN --python_filename=RelVal_DigiL1RawHLT_$name.py  --processName=$PNAME
+    cmsDriver.py RelVal                --step=DIGI:pdigi_valid,L1,DIGI2RAW,$XHLT   --conditions=$GTAG --filein=$InputGenSim                        --custom_conditions=$XL1T  --fileout=RelVal_DigiL1RawHLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW-HLT'  --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT  --scenario=$SCEN --python_filename=RelVal_DigiL1RawHLT_$name.py  --processName=$PNAME
 
     if ( ($table != HIon) && ($table != PIon) ) then
 

SimGeneral/MixingModule/python/digitizers_cfi.py

@@ -0,0 +1,54 @@
+import FWCore.ParameterSet.Config as cms
+
+# configuration to model pileup for initial physics phase
+from SimGeneral.MixingModule.aliases_cfi import *
+from SimGeneral.MixingModule.pixelDigitizer_cfi import *
+from SimGeneral.MixingModule.stripDigitizer_cfi import *
+from SimGeneral.MixingModule.ecalDigitizer_cfi import *
+from SimGeneral.MixingModule.hcalDigitizer_cfi import *
+from SimGeneral.MixingModule.castorDigitizer_cfi import *
+from SimGeneral.MixingModule.trackingTruthProducer_cfi import *
+
+theDigitizers = cms.PSet(
+  pixel = cms.PSet(
+    pixelDigitizer
+  ),
+  strip = cms.PSet(
+    stripDigitizer
+  ),
+  ecal = cms.PSet(
+    ecalDigitizer
+  ),
+  hcal = cms.PSet(
+    hcalDigitizer
+  ),
+  castor  = cms.PSet(
+    castorDigitizer
+  )
+)
+
+theDigitizersValid = cms.PSet(
+  pixel = cms.PSet(
+    pixelDigitizer
+  ),
+  strip = cms.PSet(
+    stripDigitizer
+  ),
+  ecal = cms.PSet(
+    ecalDigitizer
+  ),
+  hcal = cms.PSet(
+    hcalDigitizer
+  ),
+  castor  = cms.PSet(
+    castorDigitizer
+  ),
+  mergedtruth = cms.PSet(
+    trackingParticles
+  )
+)
+
+
+
+
+

SimGeneral/MixingModule/python/mixHighLumPU_4sources_cfi.py

@@ -12,37 +12,12 @@
 #
 # we have put minbias files for all the sources, just as an example
 #
-from SimGeneral.MixingModule.aliases_cfi import *
-from SimGeneral.MixingModule.mixObjects_cfi import *
+from SimGeneral.MixingModule.mixObjects_cfi import theMixObjects
 from SimGeneral.MixingModule.mixPoolSource_cfi import *
-from SimGeneral.MixingModule.pixelDigitizer_cfi import *
-from SimGeneral.MixingModule.stripDigitizer_cfi import *
-from SimGeneral.MixingModule.ecalDigitizer_cfi import *
-from SimGeneral.MixingModule.hcalDigitizer_cfi import *
-from SimGeneral.MixingModule.castorDigitizer_cfi import *
-from SimGeneral.MixingModule.trackingTruthProducer_cfi import *
+from SimGeneral.MixingModule.digitizers_cfi import *
 
 mix = cms.EDProducer("MixingModule",
-    digitizers = cms.PSet(
-      pixel = cms.PSet(
-        pixelDigitizer
-      ),
-      strip = cms.PSet(
-        stripDigitizer
-      ),
-      ecal = cms.PSet(
-        ecalDigitizer
-      ),
-      hcal = cms.PSet(
-        hcalDigitizer
-      ),
-      castor  = cms.PSet(
-        castorDigitizer
-      ),
-      mergedtruth = cms.PSet(
-      	trackingParticles
-      )
-    ),
+    digitizers = cms.PSet(theDigitizers),
     LabelPlayback = cms.string(''),
     maxBunch = cms.int32(3),
     minBunch = cms.int32(-5), ## in units of 25 nsec
@@ -110,23 +85,7 @@
         '/store/relval/CMSSW_2_1_10/RelValMinBias/GEN-SIM-DIGI-RAW-HLTDEBUG/STARTUP_V7_v2/0000/8802D325-5E99-DD11-B858-000423D98A44.root')
 
     ),
-    mixObjects = cms.PSet(
-        mixCH = cms.PSet(
-            mixCaloHits
-        ),
-        mixTracks = cms.PSet(
-            mixSimTracks
-        ),
-        mixVertices = cms.PSet(
-            mixSimVertices
-        ),
-        mixSH = cms.PSet(
-            mixSimHits
-        ),
-        mixHepMC = cms.PSet(
-            mixHepMCProducts
-        )
-    )
+    mixObjects = cms.PSet(theMixObjects)
 )
 
 

SimGeneral/MixingModule/python/mixHighLumPU_cfi.py

@@ -5,37 +5,12 @@
 import FWCore.ParameterSet.Config as cms
 
 # this is the configuration to model pileup for final scheme
-from SimGeneral.MixingModule.aliases_cfi import *
-from SimGeneral.MixingModule.mixObjects_cfi import *
+from SimGeneral.MixingModule.mixObjects_cfi import theMixObjects
 from SimGeneral.MixingModule.mixPoolSource_cfi import *
-from SimGeneral.MixingModule.pixelDigitizer_cfi import *
-from SimGeneral.MixingModule.stripDigitizer_cfi import *
-from SimGeneral.MixingModule.ecalDigitizer_cfi import *
-from SimGeneral.MixingModule.hcalDigitizer_cfi import *
-from SimGeneral.MixingModule.castorDigitizer_cfi import *
-from SimGeneral.MixingModule.trackingTruthProducer_cfi import *
+from SimGeneral.MixingModule.digitizers_cfi import *
 
 mix = cms.EDProducer("MixingModule",
-    digitizers = cms.PSet(
-      pixel = cms.PSet(
-        pixelDigitizer
-      ),
-      strip = cms.PSet(
-        stripDigitizer
-      ),
-      ecal = cms.PSet(
-        ecalDigitizer
-      ),
-      hcal = cms.PSet(
-        hcalDigitizer
-      ),
-      castor  = cms.PSet(
-        castorDigitizer
-      ),
-      mergedtruth = cms.PSet(
-      	trackingParticles
-      )
-    ),
+    digitizers = cms.PSet(theDigitizers),
     LabelPlayback = cms.string(''),
     maxBunch = cms.int32(3),
     minBunch = cms.int32(-5), ## in terms of 25 ns
@@ -56,23 +31,7 @@
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames
       ),
-    mixObjects = cms.PSet(
-        mixCH = cms.PSet(
-            mixCaloHits
-        ),
-        mixTracks = cms.PSet(
-            mixSimTracks
-        ),
-        mixVertices = cms.PSet(
-            mixSimVertices
-        ),
-        mixSH = cms.PSet(
-            mixSimHits
-        ),
-        mixHepMC = cms.PSet(
-            mixHepMCProducts
-        )
-    )
+    mixObjects = cms.PSet(theMixObjects)
 )
 
 

SimGeneral/MixingModule/python/mixInitialLumPU_4sources_cfi.py

@@ -10,30 +10,11 @@
 # or you can replace the type by "none" for a source you dont want
 # please note that the names of the input sources are fixed: 'input', 'cosmics', 'beamhalo_minus', 'beamhalo_plus'
 #
-from SimGeneral.MixingModule.aliases_cfi import *
+from SimGeneral.MixingModule.digitizers_cfi import *
 from SimGeneral.MixingModule.mixObjects_cfi import *
-from SimGeneral.MixingModule.trackingTruthProducer_cfi import *
+
 mix = cms.EDProducer("MixingModule",
-    digitizers = cms.PSet(
-      pixel = cms.PSet(
-        pixelDigitizer
-      ),
-      strip = cms.PSet(
-        stripDigitizer
-      ),
-      ecal = cms.PSet(
-        ecalDigitizer
-      ),
-      hcal = cms.PSet(
-        hcalDigitizer
-      ),
-      castor  = cms.PSet(
-        castorDigitizer
-      ),
-      mergedtruth = cms.PSet(
-      	trackingParticles
-      )
-    ),
+    digitizers = cms.PSet(theDigitizers),
     LabelPlayback = cms.string(''),
     maxBunch = cms.int32(3),
     minBunch = cms.int32(-5), ## in units of 25 nsec
@@ -103,23 +84,7 @@
         '/store/relval/CMSSW_2_1_10/RelValMinBias/GEN-SIM-DIGI-RAW-HLTDEBUG/STARTUP_V7_v2/0000/8802D325-5E99-DD11-B858-000423D98A44.root')
 
     ),
-    mixObjects = cms.PSet(
-        mixCH = cms.PSet(
-            mixCaloHits
-        ),
-        mixTracks = cms.PSet(
-            mixSimTracks
-        ),
-        mixVertices = cms.PSet(
-            mixSimVertices
-        ),
-        mixSH = cms.PSet(
-            mixSimHits
-        ),
-        mixHepMC = cms.PSet(
-            mixHepMCProducts
-        )
-    )
+    mixObjects = cms.PSet(theMixObjects)
 )
 
 

SimGeneral/MixingModule/python/mixInitialLumPU_cfi.py

@@ -5,37 +5,12 @@
 import FWCore.ParameterSet.Config as cms
 
 # configuration to model pileup for initial physics phase
-from SimGeneral.MixingModule.aliases_cfi import *
-from SimGeneral.MixingModule.mixObjects_cfi import *
+from SimGeneral.MixingModule.mixObjects_cfi import theMixObjects
 from SimGeneral.MixingModule.mixPoolSource_cfi import *
-from SimGeneral.MixingModule.pixelDigitizer_cfi import *
-from SimGeneral.MixingModule.stripDigitizer_cfi import *
-from SimGeneral.MixingModule.ecalDigitizer_cfi import *
-from SimGeneral.MixingModule.hcalDigitizer_cfi import *
-from SimGeneral.MixingModule.castorDigitizer_cfi import *
-from SimGeneral.MixingModule.trackingTruthProducer_cfi import *
+from SimGeneral.MixingModule.digitizers_cfi import *
 
 mix = cms.EDProducer("MixingModule",
-    digitizers = cms.PSet(
-      pixel = cms.PSet(
-        pixelDigitizer
-      ),
-      strip = cms.PSet(
-        stripDigitizer
-      ),
-      ecal = cms.PSet(
-        ecalDigitizer
-      ),
-      hcal = cms.PSet(
-        hcalDigitizer
-      ),
-      castor  = cms.PSet(
-        castorDigitizer
-      ),
-      mergedtruth = cms.PSet(
-      	trackingParticles
-      )
-    ),
+    digitizers = cms.PSet(theDigitizers),
     LabelPlayback = cms.string(''),
     maxBunch = cms.int32(3),
     minBunch = cms.int32(-5), ## in terms of 25 nsec
@@ -56,23 +31,7 @@
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames
     ),
-    mixObjects = cms.PSet(
-        mixCH = cms.PSet(
-            mixCaloHits
-        ),
-        mixTracks = cms.PSet(
-            mixSimTracks
-        ),
-        mixVertices = cms.PSet(
-            mixSimVertices
-        ),
-        mixSH = cms.PSet(
-            mixSimHits
-        ),
-        mixHepMC = cms.PSet(
-            mixHepMCProducts
-        )
-    )
+    mixObjects = cms.PSet(theMixObjects)
 )