Merge pull request #1491 from davidlange6/rebasedPull1056

remake Salavats changes in pull request 1056
cms-sw · Nov 18, 2013 · 1430ae3 · 1430ae3
2 parents 541fa94 + b040abc
commit 1430ae3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py
@@ -33,9 +33,7 @@
         firstRing = cms.int32(1),
         binOfMaximum = cms.int32(5),
         doPhotoStatistics = cms.bool(True),
-        photoelectronsToAnalog = cms.vdouble(0.24, 0.24, 0.24, 0.24,
-            0.17, 0.17, 0.17, 0.17, 0.17, 0.17, 
-            0.17, 0.17, 0.17, 0.17, 0.17), 
+        photoelectronsToAnalog = cms.vdouble(cms.vdouble([4.0]*16)),
         simHitToPhotoelectrons = cms.double(4000.0), # is not actually used
         samplingFactors = cms.vdouble(231.0, 231.0, 231.0, 231.0,
             360.0, 360.0, 360.0, 360.0, 360.0, 360.0,
@@ -44,7 +42,8 @@
         timePhase = cms.double(5.0),
         timeSmearing = cms.bool(False),
         # 0 is HPD, 1 is SiPM, 2 fetches HPD/Zecotek/Hamamatsufrom DB
-        siPMCode = cms.int32(2),
+        siPMCode = cms.int32(1),
+        pixels = cms.int32(2500),
         doSiPMSmearing = cms.bool(False)
     ),
     hb = cms.PSet(