first Hcal update

Conflicts:
	SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
	SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h
	SimGeneral/DataMixingModule/plugins/DataMixingModule.h
second round of changes

Conflicts:
	SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h
	SimCalorimetry/CaloSimAlgos/src/CaloHitResponse.cc
	SimCalorimetry/EcalSimAlgos/interface/EcalBaseSignalGenerator.h
	SimCalorimetry/EcalSimAlgos/interface/EcalElectronicsSim.h
	SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
	SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h
	SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
	SimCalorimetry/EcalSimAlgos/src/EcalCoder.cc
	SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
	SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h
	SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h
	SimCalorimetry/HcalSimAlgos/src/HcalAmplifier.cc
	SimCalorimetry/HcalSimProducers/python/hcalUnsuppressedDigis_cfi.py
	SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.cc
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.h
	SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
	SimGeneral/DataMixingModule/plugins/DataMixingModule.h
Ecal code compiles, minus ES

Conflicts:
	SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc
	SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h
	SimCalorimetry/EcalSimAlgos/interface/EcalBaseSignalGenerator.h
	SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
	SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h
	SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
	SimCalorimetry/EcalSimAlgos/src/EcalCoder.cc
	SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.cc
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.h
	SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc
tracker cleanup

Conflicts:
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.cc
	SimGeneral/DataMixingModule/plugins/DataMixingSiStripMCDigiWorker.cc
	SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py
conf changes

Conflicts:
	Configuration/StandardSequences/python/Digi_PreMix_cff.py
save changes, move base release

Conflicts:
	SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h
	SimCalorimetry/CaloSimAlgos/src/CaloHitResponse.cc
	SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
	SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
	SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h
	SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
clean up

Conflicts:
	SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc
proper noise settings for trackers

Conflicts:
	SimGeneral/MixingModule/python/digi_noNoise_cfi.py
no Hcal time slew

Conflicts:
	Configuration/StandardSequences/python/Digi_PreMix_cff.py
	SimGeneral/MixingModule/python/digi_noNoise_cfi.py
Find RPCs!

Conflicts:
	SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py
Finish EB work

Conflicts:
	SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.cc
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.h
	SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py
	SimGeneral/MixingModule/python/digi_noNoise_cfi.py
First incorporation of ES

Conflicts:
	SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h
	SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
	SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc
Commit EE/ES-related changes, clean up

Conflicts:
	Configuration/StandardSequences/python/Digi_PreMix_cff.py
	SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h
	SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
	SimCalorimetry/EcalSimAlgos/src/ESElectronicsSimFast.cc
	SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc
	SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h
	SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.cc
	SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py
first cleanup of missing commits, one header clash

Conflicts:
	SimCalorimetry/EcalSimAlgos/src/EcalSignalGenerator.cc
finish cleanup/official sequence reorganization

Conflicts:
	Configuration/Applications/python/ConfigBuilder.py
	SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py
	SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py
clean ups

Conflicts:
	Configuration/Applications/python/ConfigBuilder.py
	SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py
	SimGeneral/MixingModule/python/digi_noNoise_cfi.py
event content

Conflicts:
	Configuration/EventContent/python/EventContent_cff.py
new aliases file for no calorimeter digis
take out debug print statments

Conflicts:
	SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.cc
	SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
cleanup

Conflicts:
	SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h
	SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc