diff --git a/[refs] b/[refs] index 2ac6d56cc5b0f..198e62a665590 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c -"refs/heads/CMSSW_7_1_X": fd0024064e2b2fe3758461ee855cfb4cdbd67aaf +"refs/heads/CMSSW_7_1_X": 57b806b9903e1ecee14923d722fe1d3ef03c5af9 diff --git a/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.cc b/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.cc index 8c454fbb8b767..43054bae288f8 100644 --- a/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.cc +++ b/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.cc @@ -57,6 +57,13 @@ EcalDigiProducer::EcalDigiProducer(const edm::ParameterSet& params) theEcalResponse = new CaloHitResponse(theParameterMap, theEcalShape); theESResponse = new CaloHitResponse(theParameterMap, theESShape); + // further phase for cosmics studies + cosmicsPhase = params.getParameter("cosmicsPhase"); + cosmicsShift = params.getParameter("cosmicsShift"); + if (cosmicsPhase) { + theEcalResponse->setPhaseShift(1.+cosmicsShift); + } + EcalCorrMatrix thisMatrix; std::vector corrNoiseMatrix = params.getParameter< std::vector >("CorrelatedNoiseMatrix"); diff --git a/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.h b/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.h index 9b712211bd2c9..3317df46687af 100644 --- a/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.h +++ b/trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.h @@ -85,6 +85,9 @@ class EcalDigiProducer : public edm::EDProducer double EBs25notCont; double EEs25notCont; + bool cosmicsPhase; + double cosmicsShift; + bool doFast; }; diff --git a/trunk/SimCalorimetry/EcalSimProducers/python/ecaldigi_cfi.py b/trunk/SimCalorimetry/EcalSimProducers/python/ecaldigi_cfi.py index 2ed4b241972ad..0c850ea976689 100644 --- a/trunk/SimCalorimetry/EcalSimProducers/python/ecaldigi_cfi.py +++ b/trunk/SimCalorimetry/EcalSimProducers/python/ecaldigi_cfi.py @@ -4,8 +4,10 @@ from SimCalorimetry.EcalSimProducers.ecalElectronicsSim_cff import * from SimCalorimetry.EcalSimProducers.esElectronicsSim_cff import * from SimCalorimetry.EcalSimProducers.ecalNotContainmentSim_cff import * +from SimCalorimetry.EcalSimProducers.ecalCosmicsSim_cff import * simEcalUnsuppressedDigis = cms.EDProducer("EcalDigiProducer", ecal_electronics_sim, + ecal_cosmics_sim, ecal_sim_parameter_map, ecal_notCont_sim, es_electronics_sim, @@ -46,3 +48,4 @@ ) +