From 2a8971e62c282df76941768dffaf8d3ac96da7f9 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 19 Nov 2013 18:35:41 +0100 Subject: [PATCH 1/7] 20131119 Update mixing configurations as in 70X --- .../MixingModule/python/digitizers_cfi.py | 54 ++++++++++++++ .../python/mixHighLumPU_4sources_cfi.py | 49 +----------- .../MixingModule/python/mixHighLumPU_cfi.py | 49 +----------- .../python/mixInitialLumPU_4sources_cfi.py | 43 +---------- .../python/mixInitialLumPU_cfi.py | 49 +----------- .../python/mixLowLumPU_4sources_cfi.py | 43 +---------- .../MixingModule/python/mixLowLumPU_cfi.py | 49 +----------- SimGeneral/MixingModule/python/mixNoPU_cfi.py | 51 ++----------- .../mix_2012_Startup_50ns_PoissonOOTPU_cfi.py | 50 +------------ .../mix_2012_Summer_50ns_PoissonOOTPU_cfi.py | 49 +----------- ...2_lumiLevel_15_20_50ns_PoissonOOTPU_cfi.py | 49 +----------- .../mix_2012_peak11_25ns_PoissonOOTPU_cfi.py | 49 +----------- .../mix_2012_peak26_50ns_PoissonOOTPU_cfi.py | 49 +----------- .../python/mix_E10TeV_FIX_1_BX432_cfi.py | 73 ------------------ .../python/mix_E10TeV_FIX_2_BX432_cfi.py | 73 ------------------ .../python/mix_E10TeV_FIX_3_BX432_cfi.py | 73 ------------------ .../python/mix_E10TeV_FIX_5_BX432_cfi.py | 73 ------------------ .../python/mix_E10TeV_L13E31_BX432_cfi.py | 74 ------------------- .../python/mix_E10TeV_L21E31_BX432_cfi.py | 74 ------------------- .../python/mix_E14TeV_L10E33_BX2808_cfi.py | 49 +----------- .../python/mix_E14TeV_L28E32_BX2808_cfi.py | 49 +----------- .../python/mix_E7TeV_AVE_1_BX156_cfi.py | 73 ------------------ .../python/mix_E7TeV_AVE_2_8_BX_50ns_cfi.py | 73 ------------------ ..._E7TeV_AVE_2_8_BXgt50ns_intime_only_cfi.py | 73 ------------------ .../python/mix_E7TeV_AVE_2_BX156_cfi.py | 73 ------------------ .../python/mix_E7TeV_AVE_2_BX2808_cfi.py | 73 ------------------ .../python/mix_E7TeV_AVE_3_BX156_cfi.py | 73 ------------------ .../python/mix_E7TeV_AVE_5_BX156_cfi.py | 73 ------------------ .../python/mix_E7TeV_Ave18p4_50ns_cfi.py | 71 ------------------ .../mix_E7TeV_Ave25_25ns_PoissonOOTPU_cfi.py | 49 +----------- .../mix_E7TeV_Ave25_50ns_PoissonOOTPU_cfi.py | 49 +----------- ..._E7TeV_Chamonix2012_50ns_PoissonOOT_cfi.py | 49 +----------- .../python/mix_E7TeV_FIX_1_BX156_cfi.py | 73 ------------------ .../python/mix_E7TeV_FIX_2_BX156_cfi.py | 73 ------------------ .../python/mix_E7TeV_FIX_3_BX156_cfi.py | 73 ------------------ .../python/mix_E7TeV_FIX_5_BX156_cfi.py | 73 ------------------ ...all2011_Reprocess_50ns_PoissonOOTPU_cfi.py | 49 +----------- .../mix_E7TeV_Flat20_AllEarly_50ns_cfi.py | 49 +----------- .../mix_E7TeV_Flat20_AllEarly_75ns_cfi.py | 49 +----------- .../mix_E7TeV_Flat20_AllLate_50ns_cfi.py | 49 +----------- .../mix_E7TeV_Flat20_AllLate_75ns_cfi.py | 49 +----------- ...ist10_2011EarlyData_25ns_PoissonOOT_cfi.py | 49 +----------- ...latDist10_2011EarlyData_50ns_PoissonOOT.py | 49 +----------- ...E7TeV_FlatDist10_2011EarlyData_50ns_cfi.py | 49 +----------- ...E7TeV_FlatDist10_2011EarlyData_75ns_cfi.py | 49 +----------- ...FlatDist10_2011EarlyData_inTimeOnly_cfi.py | 49 +----------- .../python/mix_E7TeV_L34E30_BX156_cfi.py | 49 +----------- .../python/mix_E7TeV_L69E30_BX156_cfi.py | 49 +----------- .../mix_E7TeV_ProbDist_2010Data_BX156_cfi.py | 49 +----------- .../mix_E7TeV_Summer_2011_50ns_PoissonOOT.py | 49 +----------- .../python/mix_E8TeV_AVE_10_BX_50ns_cfi.py | 73 ------------------ .../python/mix_E8TeV_AVE_16_BX_25ns_cfi.py | 73 ------------------ .../python/mix_E8TeV_AVE_16_BX_50ns_cfi.py | 73 ------------------ ...x_E8TeV_FlatDist_2011EarlyData_50ns_cfi.py | 49 +----------- ...x_E8TeV_ProbDist_2011EarlyData_50ns_cfi.py | 49 +----------- .../python/mix_E8TeV_run198588_BX_50ns_cfi.py | 50 +------------ .../python/mix_E8TeV_run203002_BX_50ns_cfi.py | 50 +------------ .../python/mix_E8TeV_run209148_BX_25ns_cfi.py | 51 +------------ .../python/mix_E8TeV_zmmg_skim_BX_50ns_cfi.py | 50 +------------ .../python/mix_FIX_average_cfi.py | 32 ++++++++ .../python/mix_POISSON_average_cfi.py | 32 ++++++++ 61 files changed, 267 insertions(+), 3193 deletions(-) create mode 100644 SimGeneral/MixingModule/python/digitizers_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_FIX_1_BX432_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_FIX_2_BX432_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_FIX_3_BX432_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_FIX_5_BX432_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_AVE_1_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BX_50ns_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BXgt50ns_intime_only_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX2808_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_AVE_3_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_AVE_5_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_Ave18p4_50ns_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_FIX_1_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_FIX_2_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_FIX_3_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E7TeV_FIX_5_BX156_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E8TeV_AVE_10_BX_50ns_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_25ns_cfi.py delete mode 100644 SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_50ns_cfi.py create mode 100644 SimGeneral/MixingModule/python/mix_FIX_average_cfi.py create mode 100644 SimGeneral/MixingModule/python/mix_POISSON_average_cfi.py diff --git a/SimGeneral/MixingModule/python/digitizers_cfi.py b/SimGeneral/MixingModule/python/digitizers_cfi.py new file mode 100644 index 0000000000000..15d413729c64c --- /dev/null +++ b/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 + ) +) + + + + + diff --git a/SimGeneral/MixingModule/python/mixHighLumPU_4sources_cfi.py b/SimGeneral/MixingModule/python/mixHighLumPU_4sources_cfi.py index c5423d7b1fced..45b20eb47d267 100644 --- a/SimGeneral/MixingModule/python/mixHighLumPU_4sources_cfi.py +++ b/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) ) diff --git a/SimGeneral/MixingModule/python/mixHighLumPU_cfi.py b/SimGeneral/MixingModule/python/mixHighLumPU_cfi.py index 736a384bf9856..df5c90602eb23 100644 --- a/SimGeneral/MixingModule/python/mixHighLumPU_cfi.py +++ b/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) ) diff --git a/SimGeneral/MixingModule/python/mixInitialLumPU_4sources_cfi.py b/SimGeneral/MixingModule/python/mixInitialLumPU_4sources_cfi.py index fb5158176a2ee..0995f338e3583 100644 --- a/SimGeneral/MixingModule/python/mixInitialLumPU_4sources_cfi.py +++ b/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) ) diff --git a/SimGeneral/MixingModule/python/mixInitialLumPU_cfi.py b/SimGeneral/MixingModule/python/mixInitialLumPU_cfi.py index 9f26b462269be..deb1ed28adc4b 100644 --- a/SimGeneral/MixingModule/python/mixInitialLumPU_cfi.py +++ b/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) ) diff --git a/SimGeneral/MixingModule/python/mixLowLumPU_4sources_cfi.py b/SimGeneral/MixingModule/python/mixLowLumPU_4sources_cfi.py index 7a191805a8311..e928d5e09aa7f 100644 --- a/SimGeneral/MixingModule/python/mixLowLumPU_4sources_cfi.py +++ b/SimGeneral/MixingModule/python/mixLowLumPU_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.mixObjects_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 @@ -100,23 +81,7 @@ '/store/relval/CMSSW_2_1_10/RelValMinBias/GEN-SIM-DIGI-RAW-HLTDEBUG/STARTUP_V7_v2/0000/68ECAE92-5F99-DD11-ACAB-000423D98E6C.root', '/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) ) diff --git a/SimGeneral/MixingModule/python/mixLowLumPU_cfi.py b/SimGeneral/MixingModule/python/mixLowLumPU_cfi.py index a618d7c404c0b..df70737352de0 100644 --- a/SimGeneral/MixingModule/python/mixLowLumPU_cfi.py +++ b/SimGeneral/MixingModule/python/mixLowLumPU_cfi.py @@ -5,37 +5,12 @@ import FWCore.ParameterSet.Config as cms # this is the configuration to model pileup in the low-luminosity 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 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) ) diff --git a/SimGeneral/MixingModule/python/mixNoPU_cfi.py b/SimGeneral/MixingModule/python/mixNoPU_cfi.py index 20b9a52dda091..66cac8f790fdf 100644 --- a/SimGeneral/MixingModule/python/mixNoPU_cfi.py +++ b/SimGeneral/MixingModule/python/mixNoPU_cfi.py @@ -3,37 +3,12 @@ # this is a minimum configuration of the Mixing module, # to run it in the zero-pileup mode # -from SimGeneral.MixingModule.aliases_cfi import * -from SimGeneral.MixingModule.mixObjects_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.mixObjects_cfi import theMixObjects +from SimGeneral.MixingModule.mixPoolSource_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 @@ -44,23 +19,7 @@ playback = cms.untracked.bool(False), useCurrentProcessOnly = cms.bool(False), - 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) ) diff --git a/SimGeneral/MixingModule/python/mix_2012_Startup_50ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_2012_Startup_50ns_PoissonOOTPU_cfi.py index aa5c2b272a930..b0fd564feb461 100644 --- a/SimGeneral/MixingModule/python/mix_2012_Startup_50ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_2012_Startup_50ns_PoissonOOTPU_cfi.py @@ -1,38 +1,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(-2), ## in terms of 25 nsec @@ -121,23 +95,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_2012_Summer_50ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_2012_Summer_50ns_PoissonOOTPU_cfi.py index 017c2d71e2d76..9256cab498813 100644 --- a/SimGeneral/MixingModule/python/mix_2012_Summer_50ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_2012_Summer_50ns_PoissonOOTPU_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -120,23 +95,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_2012_lumiLevel_15_20_50ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_2012_lumiLevel_15_20_50ns_PoissonOOTPU_cfi.py index e3e0bfa59591a..cf7a4dc0ee9ea 100644 --- a/SimGeneral/MixingModule/python/mix_2012_lumiLevel_15_20_50ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_2012_lumiLevel_15_20_50ns_PoissonOOTPU_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -86,23 +61,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_2012_peak11_25ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_2012_peak11_25ns_PoissonOOTPU_cfi.py index a310d69c0f39c..a1b0678b37efe 100644 --- a/SimGeneral/MixingModule/python/mix_2012_peak11_25ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_2012_peak11_25ns_PoissonOOTPU_cfi.py @@ -1,37 +1,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(4), minBunch = cms.int32(-4), ## in terms of 25 nsec @@ -82,23 +57,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_2012_peak26_50ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_2012_peak26_50ns_PoissonOOTPU_cfi.py index 573877eec7bae..dad6f78c4c378 100644 --- a/SimGeneral/MixingModule/python/mix_2012_peak26_50ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_2012_peak26_50ns_PoissonOOTPU_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -97,23 +72,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_1_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_FIX_1_BX432_cfi.py deleted file mode 100644 index 875055048a5f6..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_1_BX432_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 ns - - bunchspace = cms.int32(50), ## ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(1.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_2_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_FIX_2_BX432_cfi.py deleted file mode 100644 index 45e5fdbd830e2..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_2_BX432_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 ns - - bunchspace = cms.int32(50), ## ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(2.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_3_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_FIX_3_BX432_cfi.py deleted file mode 100644 index a2891db463f4b..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_3_BX432_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 ns - - bunchspace = cms.int32(50), ## ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(3.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_5_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_FIX_5_BX432_cfi.py deleted file mode 100644 index 66e97934ea9d1..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E10TeV_FIX_5_BX432_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 ns - - bunchspace = cms.int32(50), ## ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(5.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py deleted file mode 100644 index 7c5cf52f5d0e3..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py +++ /dev/null @@ -1,74 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 ns - - bunchspace = cms.int32(50), ## ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - sigmaInel = cms.double(75.3), #The Xsec is in mb - Lumi = cms.double(0.13) # The lumi is in E33 cm-2s-1 - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py deleted file mode 100644 index 3cc2b7880ce73..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py +++ /dev/null @@ -1,74 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 ns - - bunchspace = cms.int32(50), ## ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - sigmaInel = cms.double(75.3), #The Xsec is in mb - Lumi = cms.double(0.21) # The lumi is in E33 cm-2s-1 - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E14TeV_L10E33_BX2808_cfi.py b/SimGeneral/MixingModule/python/mix_E14TeV_L10E33_BX2808_cfi.py index 209eaaaf74993..bebfc016f8783 100644 --- a/SimGeneral/MixingModule/python/mix_E14TeV_L10E33_BX2808_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E14TeV_L10E33_BX2808_cfi.py @@ -1,37 +1,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 @@ -52,23 +27,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E14TeV_L28E32_BX2808_cfi.py b/SimGeneral/MixingModule/python/mix_E14TeV_L28E32_BX2808_cfi.py index 23e2be69e6cd9..f77080f264329 100644 --- a/SimGeneral/MixingModule/python/mix_E14TeV_L28E32_BX2808_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E14TeV_L28E32_BX2808_cfi.py @@ -1,37 +1,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 @@ -52,23 +27,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_1_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_AVE_1_BX156_cfi.py deleted file mode 100644 index 3436109dea5a8..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_1_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(1.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BX_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BX_50ns_cfi.py deleted file mode 100644 index ea43dce0320f5..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BX_50ns_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(2), - minBunch = cms.int32(-3), ## in 50ns spacing, go 150ns into past - - bunchspace = cms.int32(50), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(2.8) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BXgt50ns_intime_only_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BXgt50ns_intime_only_cfi.py deleted file mode 100644 index 0f49433a7266a..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_8_BXgt50ns_intime_only_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(0), ## only look in-time, at bunch 0 - minBunch = cms.int32(0), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(2.8) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX156_cfi.py deleted file mode 100644 index e253a999baa12..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(2.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX2808_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX2808_cfi.py deleted file mode 100644 index 86b4e0748a466..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_2_BX2808_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(25), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(2.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_3_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_AVE_3_BX156_cfi.py deleted file mode 100644 index 77c25b5928da9..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_3_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(3.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_5_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_AVE_5_BX156_cfi.py deleted file mode 100644 index 1ab5852498ccb..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_AVE_5_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(5.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Ave18p4_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Ave18p4_50ns_cfi.py deleted file mode 100644 index db29ef1a9df7a..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Ave18p4_50ns_cfi.py +++ /dev/null @@ -1,71 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-2), # in terms of 25 nsec - - bunchspace = cms.int32(50), # ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - type = cms.string('poisson'), - nbPileupEvents = cms.PSet( - averageNumber = cms.double(18.4) # corresponding to 4e33 luminosity - ), - 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 - ) - ) -) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_25ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_25ns_PoissonOOTPU_cfi.py index 84e30e09bacbc..2b6c2b49c5816 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_25ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_25ns_PoissonOOTPU_cfi.py @@ -1,37 +1,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(5), minBunch = cms.int32(-3), ## in terms of 25 nsec @@ -111,23 +86,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_50ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_50ns_PoissonOOTPU_cfi.py index c01565f1f759c..95bbee9f37b61 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_50ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Ave25_50ns_PoissonOOTPU_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -111,23 +86,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Chamonix2012_50ns_PoissonOOT_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Chamonix2012_50ns_PoissonOOT_cfi.py index c40a809f5fc51..815b737af829a 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Chamonix2012_50ns_PoissonOOT_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Chamonix2012_50ns_PoissonOOT_cfi.py @@ -1,37 +1,12 @@ import FWCore.ParameterSet.Config as cms # configuration to model pileup for Chamonix 2012 studies -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(-2), ## in terms of 25 nsec @@ -62,23 +37,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_1_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FIX_1_BX156_cfi.py deleted file mode 100644 index df10e903e9187..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_1_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(1.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_2_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FIX_2_BX156_cfi.py deleted file mode 100644 index 50e6a21a71f2c..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_2_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(2.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_3_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FIX_3_BX156_cfi.py deleted file mode 100644 index 7691036895e4a..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_3_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(3.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_5_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FIX_5_BX156_cfi.py deleted file mode 100644 index d23efba3330fb..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FIX_5_BX156_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(450), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(5.0) - ), - type = cms.string('fixed'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Fall2011_Reprocess_50ns_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Fall2011_Reprocess_50ns_PoissonOOTPU_cfi.py index faf5d5ef644e6..b8f6bb9df6ea5 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Fall2011_Reprocess_50ns_PoissonOOTPU_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Fall2011_Reprocess_50ns_PoissonOOTPU_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -111,23 +86,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_50ns_cfi.py index 713564fb9ba8c..2f06d5b9a6390 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_50ns_cfi.py @@ -1,37 +1,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(-2), ## all bunches come 75 ns early minBunch = cms.int32(-2), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_75ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_75ns_cfi.py index ad21ce5595d68..abca32b0ede23 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_75ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_75ns_cfi.py @@ -1,37 +1,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), ## all bunches come 75 ns early minBunch = cms.int32(-3), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_50ns_cfi.py index 2ff7d629c874a..80ff986f52e8b 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_50ns_cfi.py @@ -1,37 +1,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(2), ## all bunches come 75 ns late minBunch = cms.int32(2), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_75ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_75ns_cfi.py index 0ac6afc34154d..c8ac2eda7744f 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_75ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_75ns_cfi.py @@ -1,37 +1,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), ## all bunches come 75 ns late minBunch = cms.int32(3), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_25ns_PoissonOOT_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_25ns_PoissonOOT_cfi.py index 45697e9dec2cb..b830016964146 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_25ns_PoissonOOT_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_25ns_PoissonOOT_cfi.py @@ -1,37 +1,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(5), minBunch = cms.int32(-3), ## in terms of 25 nsec @@ -60,23 +35,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_PoissonOOT.py b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_PoissonOOT.py index f20ad8ec9f089..f24d94cbe8a0e 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_PoissonOOT.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_PoissonOOT.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -60,23 +35,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_cfi.py index d44e93782b350..8393d78c6c009 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_75ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_75ns_cfi.py index d15e3241bec08..a144540206b00 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_75ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_75ns_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -53,23 +28,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_inTimeOnly_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_inTimeOnly_cfi.py index 91c831eed4a15..d92344e72836d 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_inTimeOnly_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_inTimeOnly_cfi.py @@ -1,37 +1,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(0), minBunch = cms.int32(0), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_L34E30_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_L34E30_BX156_cfi.py index a76a5a384072a..33519e1a91940 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_L34E30_BX156_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_L34E30_BX156_cfi.py @@ -1,37 +1,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 @@ -52,23 +27,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_L69E30_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_L69E30_BX156_cfi.py index 70dfa5c25e11e..8214a4efe18cf 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_L69E30_BX156_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_L69E30_BX156_cfi.py @@ -1,37 +1,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 @@ -52,23 +27,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_ProbDist_2010Data_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_ProbDist_2010Data_BX156_cfi.py index 5a6bf72e61117..c4a7635d9046c 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_ProbDist_2010Data_BX156_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_ProbDist_2010Data_BX156_cfi.py @@ -1,37 +1,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(0), minBunch = cms.int32(0), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Summer_2011_50ns_PoissonOOT.py b/SimGeneral/MixingModule/python/mix_E7TeV_Summer_2011_50ns_PoissonOOT.py index b7c475d7b693c..9c7eb143db4c3 100644 --- a/SimGeneral/MixingModule/python/mix_E7TeV_Summer_2011_50ns_PoissonOOT.py +++ b/SimGeneral/MixingModule/python/mix_E7TeV_Summer_2011_50ns_PoissonOOT.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -61,23 +36,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_AVE_10_BX_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_AVE_10_BX_50ns_cfi.py deleted file mode 100644 index f242e2449d69d..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E8TeV_AVE_10_BX_50ns_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(2), - minBunch = cms.int32(-3), ## in 50ns spacing, go 150ns into past - - bunchspace = cms.int32(50), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(10.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_25ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_25ns_cfi.py deleted file mode 100644 index 814c759d2b4f7..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_25ns_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(3), - minBunch = cms.int32(-5), ## in terms of 25 nsec - - bunchspace = cms.int32(25), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(16.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_50ns_cfi.py deleted file mode 100644 index 0b1e3068112e9..0000000000000 --- a/SimGeneral/MixingModule/python/mix_E8TeV_AVE_16_BX_50ns_cfi.py +++ /dev/null @@ -1,73 +0,0 @@ -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.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 * - -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 - ) - ), - LabelPlayback = cms.string(''), - maxBunch = cms.int32(2), - minBunch = cms.int32(-3), ## in 50ns spacing, go 150ns into past - - bunchspace = cms.int32(50), ##ns - mixProdStep1 = cms.bool(False), - mixProdStep2 = cms.bool(False), - - playback = cms.untracked.bool(False), - useCurrentProcessOnly = cms.bool(False), - - input = cms.SecSource("PoolSource", - nbPileupEvents = cms.PSet( - averageNumber = cms.double(16.0) - ), - type = cms.string('poisson'), - 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 - ) - ) -) - - diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_FlatDist_2011EarlyData_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_FlatDist_2011EarlyData_50ns_cfi.py index a8f4827f8b5aa..395a75100ca0c 100644 --- a/SimGeneral/MixingModule/python/mix_E8TeV_FlatDist_2011EarlyData_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E8TeV_FlatDist_2011EarlyData_50ns_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_ProbDist_2011EarlyData_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_ProbDist_2011EarlyData_50ns_cfi.py index b6c03bbf5a97b..29e4b6560957b 100644 --- a/SimGeneral/MixingModule/python/mix_E8TeV_ProbDist_2011EarlyData_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E8TeV_ProbDist_2011EarlyData_50ns_cfi.py @@ -1,37 +1,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(-2), ## in terms of 25 nsec @@ -54,23 +29,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) ) diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_run198588_BX_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_run198588_BX_50ns_cfi.py index 0ff0ac2e82d94..9676eed63f957 100644 --- a/SimGeneral/MixingModule/python/mix_E8TeV_run198588_BX_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E8TeV_run198588_BX_50ns_cfi.py @@ -1,37 +1,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(0), minBunch = cms.int32(0), ## in 50ns spacing, go 150ns into past @@ -106,24 +81,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_run203002_BX_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_run203002_BX_50ns_cfi.py index ac4dcd0bfb46d..869052a1b29a0 100644 --- a/SimGeneral/MixingModule/python/mix_E8TeV_run203002_BX_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E8TeV_run203002_BX_50ns_cfi.py @@ -1,37 +1,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(-12), ## in 50ns spacing, go 150ns into past @@ -106,24 +81,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_run209148_BX_25ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_run209148_BX_25ns_cfi.py index 8542bfb3cd85f..29f6176575853 100644 --- a/SimGeneral/MixingModule/python/mix_E8TeV_run209148_BX_25ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E8TeV_run209148_BX_25ns_cfi.py @@ -1,37 +1,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(-12), ## in terms of 25 nsec @@ -81,25 +56,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_zmmg_skim_BX_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_zmmg_skim_BX_50ns_cfi.py index bd85414a769a2..4d6f941838e02 100644 --- a/SimGeneral/MixingModule/python/mix_E8TeV_zmmg_skim_BX_50ns_cfi.py +++ b/SimGeneral/MixingModule/python/mix_E8TeV_zmmg_skim_BX_50ns_cfi.py @@ -1,37 +1,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(-12), ## in 50ns spacing, go 150ns into past @@ -116,24 +91,7 @@ #intFixed_OOT = cms.untracked.int32(2), 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) ) diff --git a/SimGeneral/MixingModule/python/mix_FIX_average_cfi.py b/SimGeneral/MixingModule/python/mix_FIX_average_cfi.py new file mode 100644 index 0000000000000..8c1c4d798dacd --- /dev/null +++ b/SimGeneral/MixingModule/python/mix_FIX_average_cfi.py @@ -0,0 +1,32 @@ +import FWCore.ParameterSet.Config as cms + +# configuration to model pileup for initial physics phase +from SimGeneral.MixingModule.mixObjects_cfi import theMixObjects +from SimGeneral.MixingModule.mixPoolSource_cfi import * +from SimGeneral.MixingModule.digitizers_cfi import * + +mix = cms.EDProducer("MixingModule", + digitizers = cms.PSet(theDigitizers), + LabelPlayback = cms.string(''), + maxBunch = cms.int32(3), + minBunch = cms.int32(-5), ## in terms of 25 nsec + + bunchspace = cms.int32(450), ##ns + mixProdStep1 = cms.bool(False), + mixProdStep2 = cms.bool(False), + + playback = cms.untracked.bool(False), + useCurrentProcessOnly = cms.bool(False), + + input = cms.SecSource("PoolSource", + nbPileupEvents = cms.PSet( + averageNumber = cms.double(1.0) + ), + type = cms.string('fixed'), + sequential = cms.untracked.bool(False), + fileNames = FileNames + ), + mixObjects = cms.PSet(theMixObjects) +) + + diff --git a/SimGeneral/MixingModule/python/mix_POISSON_average_cfi.py b/SimGeneral/MixingModule/python/mix_POISSON_average_cfi.py new file mode 100644 index 0000000000000..82b7400c3bfb8 --- /dev/null +++ b/SimGeneral/MixingModule/python/mix_POISSON_average_cfi.py @@ -0,0 +1,32 @@ +import FWCore.ParameterSet.Config as cms + +# configuration to model pileup for initial physics phase +from SimGeneral.MixingModule.mixObjects_cfi import theMixObjects +from SimGeneral.MixingModule.mixPoolSource_cfi import * +from SimGeneral.MixingModule.digitizers_cfi import * + +mix = cms.EDProducer("MixingModule", + digitizers = cms.PSet(theDigitizers), + LabelPlayback = cms.string(''), + maxBunch = cms.int32(3), + minBunch = cms.int32(-5), ## in terms of 25 nsec + + bunchspace = cms.int32(450), ##ns + mixProdStep1 = cms.bool(False), + mixProdStep2 = cms.bool(False), + + playback = cms.untracked.bool(False), + useCurrentProcessOnly = cms.bool(False), + + input = cms.SecSource("PoolSource", + nbPileupEvents = cms.PSet( + averageNumber = cms.double(1.0) + ), + type = cms.string('poisson'), + sequential = cms.untracked.bool(False), + fileNames = FileNames + ), + mixObjects = cms.PSet(theMixObjects) +) + + From 0849c179fcd02da84baf3796567105eaa9e588f3 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 19 Nov 2013 18:38:28 +0100 Subject: [PATCH 2/7] 20131119 synchronize scenarios with 70X --- .../python/mix_E10TeV_L13E31_BX432_cfi.py | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py new file mode 100644 index 0000000000000..95d86274802f7 --- /dev/null +++ b/SimGeneral/MixingModule/python/mix_E10TeV_L13E31_BX432_cfi.py @@ -0,0 +1,33 @@ +import FWCore.ParameterSet.Config as cms + +# this is the configuration to model pileup for final scheme +from SimGeneral.MixingModule.mixObjects_cfi import theMixObjects +from SimGeneral.MixingModule.mixPoolSource_cfi import * +from SimGeneral.MixingModule.digitizers_cfi import * + +mix = cms.EDProducer("MixingModule", + digitizers = cms.PSet(theDigitizers), + LabelPlayback = cms.string(''), + maxBunch = cms.int32(3), + minBunch = cms.int32(-5), ## in terms of 25 ns + + bunchspace = cms.int32(50), ## ns + mixProdStep1 = cms.bool(False), + mixProdStep2 = cms.bool(False), + + playback = cms.untracked.bool(False), + useCurrentProcessOnly = cms.bool(False), + + input = cms.SecSource("PoolSource", + nbPileupEvents = cms.PSet( + sigmaInel = cms.double(75.3), #The Xsec is in mb + Lumi = cms.double(0.13) # The lumi is in E33 cm-2s-1 + ), + type = cms.string('poisson'), + sequential = cms.untracked.bool(False), + fileNames = FileNames + ), + mixObjects = cms.PSet(theMixObjects) +) + + From 4046816652d05f148e1ad7588d8178eb118b13e5 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 19 Nov 2013 18:39:50 +0100 Subject: [PATCH 3/7] 20131119 synchronize scenarios with 70X --- .../python/mix_E10TeV_L21E31_BX432_cfi.py | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py diff --git a/SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py b/SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py new file mode 100644 index 0000000000000..eaaca8f37c2b4 --- /dev/null +++ b/SimGeneral/MixingModule/python/mix_E10TeV_L21E31_BX432_cfi.py @@ -0,0 +1,33 @@ +import FWCore.ParameterSet.Config as cms + +# this is the configuration to model pileup for final scheme +from SimGeneral.MixingModule.mixObjects_cfi import theMixObjects +from SimGeneral.MixingModule.mixPoolSource_cfi import * +from SimGeneral.MixingModule.digitizers_cfi import * + +mix = cms.EDProducer("MixingModule", + digitizers = cms.PSet(theDigitizers), + LabelPlayback = cms.string(''), + maxBunch = cms.int32(3), + minBunch = cms.int32(-5), ## in terms of 25 ns + + bunchspace = cms.int32(50), ## ns + mixProdStep1 = cms.bool(False), + mixProdStep2 = cms.bool(False), + + playback = cms.untracked.bool(False), + useCurrentProcessOnly = cms.bool(False), + + input = cms.SecSource("PoolSource", + nbPileupEvents = cms.PSet( + sigmaInel = cms.double(75.3), #The Xsec is in mb + Lumi = cms.double(0.21) # The lumi is in E33 cm-2s-1 + ), + type = cms.string('poisson'), + sequential = cms.untracked.bool(False), + fileNames = FileNames + ), + mixObjects = cms.PSet(theMixObjects) +) + + From 79c11ad91f3a2f0cf493b17d576fe63a16992dc1 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 19 Nov 2013 19:08:42 +0100 Subject: [PATCH 4/7] 20131119 adapt pile-up scenarios to 70X --- .../StandardSequences/python/Mixing.py | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/Configuration/StandardSequences/python/Mixing.py b/Configuration/StandardSequences/python/Mixing.py index 960ca36b8e6f0..25443f5abb321 100644 --- a/Configuration/StandardSequences/python/Mixing.py +++ b/Configuration/StandardSequences/python/Mixing.py @@ -14,40 +14,40 @@ def addMixingScenario(label,dict): ##full sim section addMixingScenario("156BxLumiPileUp",{'file': 'SimGeneral.MixingModule.StageA156Bx_cfi'}) -addMixingScenario("E10TeV_FIX_1_BX432",{'file': 'SimGeneral.MixingModule.mix_E10TeV_FIX_1_BX432_cfi'}) -addMixingScenario("E10TeV_FIX_2_BX432",{'file': 'SimGeneral.MixingModule.mix_E10TeV_FIX_1_BX432_cfi', 'N': 2}) -addMixingScenario("E10TeV_FIX_3_BX432",{'file': 'SimGeneral.MixingModule.mix_E10TeV_FIX_1_BX432_cfi', 'N': 3}) -addMixingScenario("E10TeV_FIX_5_BX432",{'file': 'SimGeneral.MixingModule.mix_E10TeV_FIX_1_BX432_cfi', 'N': 5}) +addMixingScenario("E10TeV_FIX_1_BX432",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 50, 'B': (-5,3), 'N': 1}) +addMixingScenario("E10TeV_FIX_2_BX432",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 50, 'B': (-5,3), 'N': 2}) +addMixingScenario("E10TeV_FIX_3_BX432",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 50, 'B': (-5,3), 'N': 3}) +addMixingScenario("E10TeV_FIX_5_BX432",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 50, 'B': (-5,3), 'N': 5}) addMixingScenario("E10TeV_L13E31_BX432",{'file': 'SimGeneral.MixingModule.mix_E10TeV_L13E31_BX432_cfi'}) addMixingScenario("E10TeV_L21E31_BX432",{'file': 'SimGeneral.MixingModule.mix_E10TeV_L21E31_BX432_cfi'}) addMixingScenario("E14TeV_L10E33_BX2808",{'file': 'SimGeneral.MixingModule.mix_E14TeV_L10E33_BX2808_cfi'}) addMixingScenario("E14TeV_L28E32_BX2808",{'file': 'SimGeneral.MixingModule.mix_E14TeV_L28E32_BX2808_cfi'}) -addMixingScenario("E7TeV_AVE_01_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi', 'N': 0.1}) -addMixingScenario("E7TeV_AVE_02_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi', 'N': 0.2}) -addMixingScenario("E7TeV_AVE_05_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi', 'N': 0.5}) -addMixingScenario("E7TeV_AVE_10_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi', 'N': 10}) -addMixingScenario("E7TeV_AVE_1_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_1_BX156_cfi', 'N': 1}) -addMixingScenario("E7TeV_AVE_1_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi', 'N': 1}) -addMixingScenario("E7TeV_AVE_20_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi', 'N': 20}) -addMixingScenario("E7TeV_AVE_2_8_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_8_BX_50ns_cfi'}) -addMixingScenario("E7TeV_AVE_2_8_BXgt50ns_intime_only",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_8_BXgt50ns_intime_only_cfi'}) -addMixingScenario("E7TeV_AVE_2_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_1_BX156_cfi','N': 2}) -addMixingScenario("E7TeV_AVE_2_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi'}) -addMixingScenario("E7TeV_AVE_3_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_1_BX156_cfi','N': 3}) -addMixingScenario("E7TeV_AVE_50_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi','N': 50}) -addMixingScenario("E7TeV_AVE_5_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_1_BX156_cfi', 'N': 5}) -addMixingScenario("E7TeV_AVE_5_BX2808",{'file': 'SimGeneral.MixingModule.mix_E7TeV_AVE_2_BX2808_cfi', 'N': 5}) -addMixingScenario("E7TeV_FIX_1_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_FIX_1_BX156_cfi'}) -addMixingScenario("E7TeV_FIX_2_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_FIX_1_BX156_cfi', 'N': 2}) -addMixingScenario("E7TeV_FIX_3_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_FIX_1_BX156_cfi', 'N': 3}) -addMixingScenario("E7TeV_FIX_5_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_FIX_1_BX156_cfi', 'N': 5}) +addMixingScenario("E7TeV_AVE_01_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 0.1}) +addMixingScenario("E7TeV_AVE_02_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 0.2}) +addMixingScenario("E7TeV_AVE_05_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 0.5}) +addMixingScenario("E7TeV_AVE_1_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 1.}) +addMixingScenario("E7TeV_AVE_2_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 2.}) +addMixingScenario("E7TeV_AVE_5_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 5.}) +addMixingScenario("E7TeV_AVE_10_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 10.}) +addMixingScenario("E7TeV_AVE_20_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 20.}) +addMixingScenario("E7TeV_AVE_50_BX2808",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 25, 'B': (-5,3), 'N': 50.}) +addMixingScenario("E7TeV_AVE_1_BX156",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 450, 'B': (-5,3), 'N': 1.}) +addMixingScenario("E7TeV_AVE_2_BX156",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 450, 'B': (-5,3), 'N': 2.}) +addMixingScenario("E7TeV_AVE_3_BX156",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 450, 'B': (-5,3), 'N': 3.}) +addMixingScenario("E7TeV_AVE_5_BX156",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 450, 'B': (-5,3), 'N': 5.}) +addMixingScenario("E7TeV_AVE_2_8_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 50, 'B': (-3,2), 'N': 2.8}) +addMixingScenario("E7TeV_AVE_2_8_BXgt50ns_intime_only",{'file': 'SimGeneral.MixingModule.mix_POISSON_avergage_cfi', 'BX': 450, 'B': (0,0), 'N': 2.8}) +addMixingScenario("E7TeV_FIX_1_BX156",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 450, 'B': (-5,3), 'N': 1}) +addMixingScenario("E7TeV_FIX_2_BX156",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 450, 'B': (-5,3), 'N': 2}) +addMixingScenario("E7TeV_FIX_3_BX156",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 450, 'B': (-5,3), 'N': 3}) +addMixingScenario("E7TeV_FIX_5_BX156",{'file': 'SimGeneral.MixingModule.mix_FIX_average_cfi', 'BX': 450, 'B': (-5,3), 'N': 5}) addMixingScenario("E7TeV_L34E30_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_L34E30_BX156_cfi'}) addMixingScenario("E7TeV_L69E30_BX156",{'file': 'SimGeneral.MixingModule.mix_E7TeV_L69E30_BX156_cfi'}) -addMixingScenario("E8TeV_AVE_4_BX_50ns",{'file':'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50,'B': (-3,2),'N': 4}) -addMixingScenario("E8TeV_AVE_10_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-3,2), 'N': 10}) -addMixingScenario("E8TeV_AVE_10_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-3,2), 'N': 10}) -addMixingScenario("E8TeV_AVE_16_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi'}) -addMixingScenario("E8TeV_AVE_16_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX': 50, 'B': (-3,2)}) +addMixingScenario("E8TeV_AVE_4_BX_50ns",{'file':'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50,'B': (-3,2),'N': 4}) +addMixingScenario("E8TeV_AVE_10_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-3,2), 'N': 10}) +addMixingScenario("E8TeV_AVE_10_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-3,2), 'N': 10}) +addMixingScenario("E8TeV_AVE_16_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-3,2), 'N': 16}) +addMixingScenario("E8TeV_AVE_16_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-3,2), 'N': 16}) addMixingScenario("E8TeV_AVE_10_BX_50ns_300ns_spread",{'file':'SimGeneral.MixingModule.mix_E8TeV_AVE_10_BX_50ns_300ns_spread_cfi'}) addMixingScenario("E8TeV_AVE_10_BX_25ns_300ns_spread",{'file':'SimGeneral.MixingModule.mix_E8TeV_AVE_10_BX_25ns_300ns_spread_cfi'}) addMixingScenario("HiMix",{'file': 'SimGeneral.MixingModule.HiEventMixing_cff'}) @@ -70,9 +70,9 @@ def addMixingScenario(label,dict): addMixingScenario("E7TeV_Flat20_AllLate_50ns",{'file': 'SimGeneral.MixingModule.mix_E7TeV_Flat20_AllLate_50ns_cfi'}) addMixingScenario("E7TeV_FlatDist10_2011EarlyData_50ns_PoissonOOT",{'file': 'SimGeneral.MixingModule.mix_E7TeV_FlatDist10_2011EarlyData_50ns_PoissonOOT'}) addMixingScenario("E7TeV_FlatDist10_2011EarlyData_25ns_PoissonOOT",{'file': 'SimGeneral.MixingModule.mix_E7TeV_FlatDist10_2011EarlyData_25ns_PoissonOOT_cfi'}) -addMixingScenario("E7TeV_Ave18p4_50ns", {'file': 'SimGeneral.MixingModule.mix_E7TeV_Ave18p4_50ns_cfi'}) -addMixingScenario("E7TeV_Ave23_50ns", {'file': 'SimGeneral.MixingModule.mix_E7TeV_Ave18p4_50ns_cfi', 'N': 23 }) -addMixingScenario("E7TeV_Ave32_50ns", {'file': 'SimGeneral.MixingModule.mix_E7TeV_Ave18p4_50ns_cfi', 'N': 32 }) +addMixingScenario("E7TeV_Ave18p4_50ns", {'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-3,2), 'N': 18.4}) +addMixingScenario("E7TeV_Ave23_50ns", {'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-3,2), 'N': 23}) +addMixingScenario("E7TeV_Ave32_50ns", {'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-3,2), 'N': 32}) addMixingScenario("E7TeV_Ave25_50ns_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_E7TeV_Ave25_50ns_PoissonOOTPU_cfi'}) addMixingScenario("E7TeV_Ave25_25ns_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_E7TeV_Ave25_25ns_PoissonOOTPU_cfi'}) addMixingScenario("E7TeV_Fall2011ReDigi_prelim_50ns_PoissonOOT",{'file': 'SimGeneral.MixingModule.mix_E7TeV_Fall2011ReDigi_prelim_50ns_PoissonOOT_cfi'}) @@ -114,34 +114,34 @@ def addMixingScenario(label,dict): #scenarios for L1 tdr work -addMixingScenario("AVE_20_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 20}) -addMixingScenario("AVE_20_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 20}) -addMixingScenario("AVE_25_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 25}) -addMixingScenario("AVE_25_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 25}) -addMixingScenario("AVE_35_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 35}) -addMixingScenario("AVE_35_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 35}) -addMixingScenario("AVE_40_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 40}) -addMixingScenario("AVE_40_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 40}) -addMixingScenario("AVE_45_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 45}) -addMixingScenario("AVE_50_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 50}) -addMixingScenario("AVE_50_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 50}) -addMixingScenario("AVE_70_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 70}) -addMixingScenario("AVE_70_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 70}) -addMixingScenario("AVE_75_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 75}) -addMixingScenario("AVE_75_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 75}) -addMixingScenario("AVE_80_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 80}) -addMixingScenario("AVE_100_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 100}) -addMixingScenario("AVE_100_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 100}) -addMixingScenario("AVE_125_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 125}) -addMixingScenario("AVE_125_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 125}) -addMixingScenario("AVE_150_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 150}) -addMixingScenario("AVE_150_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 150}) -addMixingScenario("AVE_175_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 175}) -addMixingScenario("AVE_175_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 175}) -addMixingScenario("AVE_200_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 200}) -addMixingScenario("AVE_200_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 200}) -addMixingScenario("AVE_140_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':50, 'B': (-12,3), 'N': 140}) -addMixingScenario("AVE_140_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_AVE_16_BX_25ns_cfi','BX':25, 'B': (-12,3), 'N': 140}) +addMixingScenario("AVE_20_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 20}) +addMixingScenario("AVE_20_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 20}) +addMixingScenario("AVE_25_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 25}) +addMixingScenario("AVE_25_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 25}) +addMixingScenario("AVE_35_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 35}) +addMixingScenario("AVE_35_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 35}) +addMixingScenario("AVE_40_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 40}) +addMixingScenario("AVE_40_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 40}) +addMixingScenario("AVE_45_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 45}) +addMixingScenario("AVE_50_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 50}) +addMixingScenario("AVE_50_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 50}) +addMixingScenario("AVE_70_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 70}) +addMixingScenario("AVE_70_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 70}) +addMixingScenario("AVE_75_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 75}) +addMixingScenario("AVE_75_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 75}) +addMixingScenario("AVE_80_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 80}) +addMixingScenario("AVE_100_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 100}) +addMixingScenario("AVE_100_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 100}) +addMixingScenario("AVE_125_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 125}) +addMixingScenario("AVE_125_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 125}) +addMixingScenario("AVE_150_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 150}) +addMixingScenario("AVE_150_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 150}) +addMixingScenario("AVE_175_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 175}) +addMixingScenario("AVE_175_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 175}) +addMixingScenario("AVE_200_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 200}) +addMixingScenario("AVE_200_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 200}) +addMixingScenario("AVE_140_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':50, 'B': (-12,3), 'N': 140}) +addMixingScenario("AVE_140_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 140}) MixingDefaultKey = '2012_Summer_50ns_PoissonOOTPU' From c742c0da703cbc419b6cc37d7bf68fddb86bec4c Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Tue, 19 Nov 2013 19:09:35 +0100 Subject: [PATCH 5/7] 20131119 add no tracking particles default as in 70X --- Configuration/Applications/python/ConfigBuilder.py | 3 +++ .../PyReleaseValidation/python/relval_steps.py | 13 ++++++------- Configuration/StandardSequences/python/Digi_cff.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 5ca23a471b792..fca207395d001 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/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 diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index a75d4be59b301..053e16a39b8ee 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/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', diff --git a/Configuration/StandardSequences/python/Digi_cff.py b/Configuration/StandardSequences/python/Digi_cff.py index d0ed390fc852a..caaa816fc6a8a 100644 --- a/Configuration/StandardSequences/python/Digi_cff.py +++ b/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) From a4c30100e8e7ebcfba4e7d25113e065150969607 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Mon, 25 Nov 2013 10:47:35 +0100 Subject: [PATCH 6/7] 20131125 fix identation in ConfigBuilder.py --- Configuration/Applications/python/ConfigBuilder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index fca207395d001..b3d6ab52f7653 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -1352,8 +1352,8 @@ 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)") + if sequence == 'pdigi_valid': + self.executeAndRemember("process.mix.digitizers = cms.PSet(process.theDigitizersValid)") self.scheduleSequence(sequence.split('.')[-1],'digitisation_step') return From 80b8c4bbd1be171016a9f6737917255b98b71683 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Mon, 25 Nov 2013 17:26:19 +0100 Subject: [PATCH 7/7] Fixup of tests for noTP pull request --- HLTrigger/Configuration/test/cmsDriver.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HLTrigger/Configuration/test/cmsDriver.csh b/HLTrigger/Configuration/test/cmsDriver.csh index 7934685a7be11..fa02f98399040 100755 --- a/HLTrigger/Configuration/test/cmsDriver.csh +++ b/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