Merge pull request #4368 from cms-sw/CMSSW_7_1_X

Forward port CMSSW_7_1_X into CMSSW_7_2_X
cms-sw · Jun 24, 2014 · ee1b716 · ee1b716
2 parents c39f790 + 29110fc
commit ee1b716
Show file tree

Hide file tree

Showing 5 changed files with 337 additions and 0 deletions.
diff --git a/Configuration/StandardSequences/python/Mixing.py b/Configuration/StandardSequences/python/Mixing.py
@@ -95,6 +95,10 @@ def addMixingScenario(label,dict):
 addMixingScenario("E8TeV_2012_25nsRunning_TrainFrontOOTPU",{'file': 'SimGeneral.MixingModule.mix_E8TeV_2012_25nsRunning_TrainFrontOOTPU_cfi'})
 addMixingScenario("2012_Summer_50ns_PoissonOOTPU_FixedInTime0",{'file': 'SimGeneral.MixingModule.mix_2012_Summer_50ns_PoissonOOTPU_FixedInTime0_cfi'})
 addMixingScenario("2012_Summer_50ns_PoissonOOTPU_FixedInTime30",{'file': 'SimGeneral.MixingModule.mix_2012_Summer_50ns_PoissonOOTPU_FixedInTime30_cfi'})
+addMixingScenario("E8TeV_2012_run198588_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_run198588_BX_50ns_cfi'})
+addMixingScenario("E8TeV_2012_run203002_BX_50ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_run203002_BX_50ns_cfi'})
+addMixingScenario("E8TeV_2012_run209148_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_E8TeV_run209148_BX_25ns_cfi'})
+addMixingScenario("E8TeV_2012_ZmumugSkim",{'file': 'SimGeneral.MixingModule.mix_E8TeV_zmmg_skim_BX_50ns_cfi'})
 addMixingScenario("CSA14_50ns_PoissonOOT",{'file': 'SimGeneral.MixingModule.mix_CSA14_50ns_PoissonOOTPU_cfi'})
 addMixingScenario("CSA14_inTimeOnly",{'file': 'SimGeneral.MixingModule.mix_CSA14_inTimeOnly_cfi'})
 addMixingScenario("Flat_20_50",{'file': 'SimGeneral.MixingModule.mix_Flat_20_50_cfi'})

diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_run198588_BX_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_run198588_BX_50ns_cfi.py
@@ -0,0 +1,87 @@
+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(0),
+    minBunch = cms.int32(0), ## 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",
+        type = cms.string('probFunction'),
+        nbPileupEvents = cms.PSet(
+             probFunctionVariable = cms.vint32(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+             probValue = cms.vdouble(
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0.0397281,
+                           0.294024,
+                           0.301409,
+                           0.226158,
+                           0.138681,
+                           0),
+          histoFileName = cms.untracked.string('histProbFunction.root'),
+        ),
+	sequential = cms.untracked.bool(False),
+        manage_OOT = cms.untracked.bool(True),  ## manage out-of-time pileup
+        ## setting this to True means that the out-of-time pileup
+        ## will have a different distribution than in-time, given
+        ## by what is described on the next line:
+        OOT_type = cms.untracked.string('Poisson'),  ## generate OOT with a Poisson matching the number chosen for in-time
+        #OOT_type = cms.untracked.string('fixed'),  ## generate OOT with a fixed distribution
+        #intFixed_OOT = cms.untracked.int32(2),
+        fileNames = FileNames
+    ),
+    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
@@ -0,0 +1,87 @@
+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(-12), ## 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",
+        type = cms.string('probFunction'),
+        nbPileupEvents = cms.PSet(
+             probFunctionVariable = cms.vint32(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+             probValue = cms.vdouble(
+                               0,
+                               0,
+                               0,
+                               0,
+                               0,
+                               9.66474e-17,
+                               1.21114e-12,
+                               2.94126e-09,
+                               1.44281e-06,
+                               0.000151792,
+                               0.00376088,
+                               0.0254935,
+                               0.0610745,
+                               0.0769054,
+                               0.076596,
+                               0.0737104,
+                               0.0720484,
+                               0.0702428,
+                               0.065689,
+                               0.0601684,
+                               0.05682,
+                               0.0557221,
+                               0.0551615,
+                               0.0541009,
+                               0.051686,
+                               0.0460924,
+                               0.0368461,
+                               0.0261355,
+                               0.0164099,
+                               0.0089456,
+                               0.00410306,
+                               0.00153858,
+                               0.000462258,
+                               0.000109812,
+                               2.04474e-05,
+                               2.96742e-06,
+                               3.34444e-07,
+                               2.9214e-08,
+                               1.97586e-09,
+                               1.03436e-10,
+                               4.19123e-12,
+                               1.31456e-13,
+                               3.19116e-15,
+                               5.99601e-17,
+                               8.75296e-19,
+                               0),
+          histoFileName = cms.untracked.string('histProbFunction.root'),
+        ),
+	sequential = cms.untracked.bool(False),
+        manage_OOT = cms.untracked.bool(True),  ## manage out-of-time pileup
+        ## setting this to True means that the out-of-time pileup
+        ## will have a different distribution than in-time, given
+        ## by what is described on the next line:
+        OOT_type = cms.untracked.string('Poisson'),  ## generate OOT with a Poisson matching the number chosen for in-time
+        #OOT_type = cms.untracked.string('fixed'),  ## generate OOT with a fixed distribution
+        #intFixed_OOT = cms.untracked.int32(2),
+        fileNames = FileNames
+    ),
+    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
@@ -0,0 +1,62 @@
+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(-12), ## 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",
+        type = cms.string('probFunction'),
+        nbPileupEvents = cms.PSet(
+             probFunctionVariable = cms.vint32(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19,20),
+             probValue = cms.vdouble(
+                    1.92747e-08,
+                    1.62702e-06,
+                    7.42292e-05,
+                    0.0017137,
+                    0.0191414,
+                    0.101638,
+                    0.258023,
+                    0.322184,
+                    0.207559,
+                    0.0730289,
+                    0.0147525,
+                    0.0017561,
+                    0.000123411,
+                    5.07434e-06,
+                    1.20848e-07,
+                    1.6531e-09,
+                    1.29003e-11,
+                    5.7105e-14,
+                    1.42153e-16,
+                    0,
+                    0),
+          histoFileName = cms.untracked.string('histProbFunction.root'),
+        ),
+	sequential = cms.untracked.bool(False),
+        manage_OOT = cms.untracked.bool(True),  ## manage out-of-time pileup
+        ## setting this to True means that the out-of-time pileup
+        ## will have a different distribution than in-time, given
+        ## by what is described on the next line:
+        OOT_type = cms.untracked.string('Poisson'),  ## generate OOT with a Poisson matching the number chosen for in-time
+        #OOT_type = cms.untracked.string('fixed'),  ## generate OOT with a fixed distribution
+        #intFixed_OOT = cms.untracked.int32(2),
+        fileNames = FileNames
+    ),
+    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
@@ -0,0 +1,97 @@
+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(-12), ## 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",
+        type = cms.string('probFunction'),
+        nbPileupEvents = cms.PSet(
+             probFunctionVariable = cms.vint32(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55),
+             probValue = cms.vdouble(
+                       2.22595e-08,
+                       2.00205e-07,
+                       1.64416e-06,
+                       1.14116e-05,
+                       6.40739e-05,
+                       0.000284833,
+                       0.000994025,
+                       0.00272863,
+                       0.00613133,
+                       0.0135242,
+                       0.0322459,
+                       0.0601265,
+                       0.0778966,
+                       0.0818541,
+                       0.0798978,
+                       0.0752475,
+                       0.0687418,
+                       0.0636304,
+                       0.0604193,
+                       0.0571488,
+                       0.0537445,
+                       0.050468,
+                       0.0470076,
+                       0.04297,
+                       0.0377791,
+                       0.0310346,
+                       0.0231801,
+                       0.0154523,
+                       0.00910777,
+                       0.00473839,
+                       0.00218447,
+                       0.000898356,
+                       0.000331497,
+                       0.000110006,
+                       3.27802e-05,
+                       8.75341e-06,
+                       2.1002e-06,
+                       4.58968e-07,
+                       9.41886e-08,
+                       1.90252e-08,
+                       3.95869e-09,
+                       8.60669e-10,
+                       1.91046e-10,
+                       4.18017e-11,
+                       8.78577e-12,
+                       1.74995e-12,
+                       3.28416e-13,
+                       5.79467e-14,
+                       9.60488e-15,
+                       1.49505e-15,
+                       2.18539e-16,
+                       2.99303e-17,
+                       3.87579e-18,
+                       4.53878e-19,
+                       3.6847e-20,
+                       0),
+          histoFileName = cms.untracked.string('histProbFunction.root'),
+        ),
+	sequential = cms.untracked.bool(False),
+        manage_OOT = cms.untracked.bool(True),  ## manage out-of-time pileup
+        ## setting this to True means that the out-of-time pileup
+        ## will have a different distribution than in-time, given
+        ## by what is described on the next line:
+        OOT_type = cms.untracked.string('Poisson'),  ## generate OOT with a Poisson matching the number chosen for in-time
+        #OOT_type = cms.untracked.string('fixed'),  ## generate OOT with a fixed distribution
+        #intFixed_OOT = cms.untracked.int32(2),
+        fileNames = FileNames
+    ),
+    mixObjects = cms.PSet(theMixObjects)
+)
+
+