cms-sw/cmssw — pull request #3473 by ktf (2014-04-24 08:15:52+00:00)
Title: Revert "Merge pull request #3444 from mdhildreth/7_0_X_Calorimeter_PreMi...

...xing_digitization_fixes"

This reverts commit 402ed94c352c298f39d96002576f1304c6673e4e, reversing
changes made to 18e1fc5378d365a139781e043becd25e9a590d7d.

Conflicts:
SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h
SimCalorimetry/EcalSimAlgos/interface/EcalElectronicsSim.h
SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
SimCalorimetry/EcalSimAlgos/src/ESElectronicsSimFast.cc
SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc
SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h
SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h
SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc
SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h
SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
SimGeneral/DataMixingModule/plugins/DataMixingModule.h