add warning about removal of seed parameter, remove seed from configs

cms-sw · Sep 22, 2015 · 135db53 · 135db53
1 parent 189d809
commit 135db53
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 12 deletions.
diff --git a/Mixing/Base/src/PileUp.cc b/Mixing/Base/src/PileUp.cc
@@ -106,6 +106,12 @@ namespace edm {
 
     bool DB=type_=="readDB";
 
+    if (pset.exists("nbPileupEvents")) {
+       if (0 != pset.getParameter<edm::ParameterSet>("nbPileupEvents").getUntrackedParameter<int>("seed",0)) {
+         edm::LogWarning("MixingModule") << "Parameter nbPileupEvents.seed is not supported";
+       }
+    }
+
     edm::Service<edm::RandomNumberGenerator> rng;
     if (!rng.isAvailable()) {
       throw cms::Exception("Configuration")

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_50ns_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.01965,0.00953,0.00440,0.00196),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_75ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllEarly_75ns_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.01965,0.00953,0.00440,0.00196),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_50ns_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.01965,0.00953,0.00440,0.00196),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_75ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_Flat20_AllLate_75ns_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.01965,0.00953,0.00440,0.00196),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_50ns_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0630151648,0.0526654164,0.0402754482,0.0292988928,0.0194384503,0.0122016783,0.007207042,0.004003637,0.0020278322,0.0010739954,0.0004595759,0.0002229748,0.0001028162,4.58337152809607E-05),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_inTimeOnly_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_FlatDist10_2011EarlyData_inTimeOnly_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0698146584,0.0630151648,0.0526654164,0.0402754482,0.0292988928,0.0194384503,0.0122016783,0.007207042,0.004003637,0.0020278322,0.0010739954,0.0004595759,0.0002229748,0.0001028162,4.58337152809607E-05),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_ProbDist_2010Data_BX156_cfi.py b/SimGeneral/MixingModule/python/mix_E7TeV_ProbDist_2010Data_BX156_cfi.py
@@ -24,7 +24,6 @@
           probFunctionVariable = cms.vint32(0,1,2,3,4,5,6,7,8,9,10),
           probValue = cms.vdouble(0.145168,0.251419,0.251596,0.17943,0.10,0.05,0.02,0.01,0.005,0.002,0.001),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E7TeV_Summer_2011_50ns_PoissonOOT.py b/SimGeneral/MixingModule/python/mix_E7TeV_Summer_2011_50ns_PoissonOOT.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.0400676665,0.040358009,0.0807116334,0.0924154156,0.0924154156,0.0924154156,0.0924154156,0.0924154156,0.0870356742,0.0767913175,0.0636400516,0.0494955563,0.036223831,0.0249767088,0.0162633216,0.0099919945,0.0058339324,0.0032326433,0.0017151846,0.0008505404,0.0004108859,0.0001905137,0.0000842383,0.000034939,0.0000142801),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         manage_OOT = cms.untracked.bool(True),  ## manage out-of-time pileup

diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_FlatDist_2011EarlyData_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_FlatDist_2011EarlyData_50ns_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.04593,0.01965,0.00953,0.00440,0.00196),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/python/mix_E8TeV_ProbDist_2011EarlyData_50ns_cfi.py b/SimGeneral/MixingModule/python/mix_E8TeV_ProbDist_2011EarlyData_50ns_cfi.py
@@ -24,7 +24,6 @@
           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),
           probValue = cms.vdouble(0.00130001,0.00728453,0.0224114,0.0458138,0.0721875,0.09741,0.114875,0.120895,0.11885,0.10471,0.0878654,0.0681808,0.0497561,0.0345137,0.0230669,0.0137068,0.00810676,0.00446449,0.00229114,0.00119335,0.000606673,0.000271114,0.000146668,6.66674e-05,2.6667e-05),
           histoFileName = cms.untracked.string('histProbFunction.root'),
-          seed = cms.untracked.int32(54321)
         ),
 	sequential = cms.untracked.bool(False),
         fileNames = FileNames

diff --git a/SimGeneral/MixingModule/test/mm_histoNumber_cfg.py b/SimGeneral/MixingModule/test/mm_histoNumber_cfg.py
@@ -52,7 +52,6 @@
 process.mix.input.nbPileupEvents = cms.PSet(
     fileName = cms.untracked.string('histrandom.root'),
     histoName = cms.untracked.string('h1f'),
-    seed = cms.untracked.int32(54321)
 )
 
 process.mix.input.fileNames = cms.untracked.vstring(

diff --git a/SimGeneral/MixingModule/test/mm_probFunction_cfg.py b/SimGeneral/MixingModule/test/mm_probFunction_cfg.py
@@ -55,7 +55,6 @@
 #    probValue = cms.vdouble(4914.0,3267.0,1311.0,397.0,92.0,14.0,3.0,2.0,0.0,0.0),
     probValue = cms.vdouble(0.4914,0.3267,0.1311,0.0397,0.0092,0.0014,0.0003,0.0002,0,0),	
     histoFileName = cms.untracked.string('histProbFunction.root'),
-    seed = cms.untracked.int32(54321)	  
 )
 
 process.mix.input.fileNames = cms.untracked.vstring(