Merge pull request #12297 from fratnikov/dm_tuning_76X

data mixer tuning for HCAL and ECAL
cms-sw · Nov 10, 2015 · 30eb309 · 30eb309
2 parents 17ca752 + 2940c00
commit 30eb309
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 554 deletions.
diff --git a/Configuration/StandardSequences/python/DataMixerDataOnSim_cff.py b/Configuration/StandardSequences/python/DataMixerDataOnSim_cff.py
@@ -51,6 +51,7 @@
 
 # disable adding noise to HCAL cells with no MC signal
 # mixData.doEmpty = False
+from SimGeneral.PileupInformation.AddPileupSummaryPreMixed_cfi import *
 
-pdatamix = cms.Sequence(mixData+postDMDigi)
+pdatamix = cms.Sequence(mixData+postDMDigi+addPileupInfo)
 
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc
@@ -468,8 +468,8 @@ namespace edm
           }
 
 
-	  // add values
-	  adc_sum = adc_new + adc_old;
+         // add values, but don't count pedestals twice
+         adc_sum = adc_new + adc_old - (int) round (pedeStals[gain_consensus-1]);
 
 	  // if the sum saturates this gain, switch
 	  if (adc_sum> 4096) {