From 1788057575a5ac3de0787332a6e7ea28db109f40 Mon Sep 17 00:00:00 2001
From: Chiara Ilaria Rovelli
 <sha1-156f87976672d5574743371779e65c95d251b39f@cern.ch>
Date: Tue, 24 Jun 2008 10:22:51 +0000
Subject: [PATCH] --- yaml --- r: 46431 b: "refs/heads/CMSSW_7_1_X" c:
 57b806b9903e1ecee14923d722fe1d3ef03c5af9 h: "refs/heads/CMSSW_7_1_X" i:  
 46429: 487131c3c0c8eb09f1be0aa293bad2e403435e3d   46427:
 f3b569f5570b55f1d6b81a11d54856c62ebd8fcd   46423:
 e263f1680fdc881e02afd14d476bac1d1a910372   46415:
 45c6ac6a2eeee5acfcea676519a7fe98b3b57c97   46399:
 96f4a39977d8dee910d929709a24c33a2ec2bde4 v: v3

---
 [refs]                                                     | 2 +-
 .../EcalSimProducers/plugins/EcalDigiProducer.cc           | 7 +++++++
 .../EcalSimProducers/plugins/EcalDigiProducer.h            | 3 +++
 .../SimCalorimetry/EcalSimProducers/python/ecaldigi_cfi.py | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

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<bool>("cosmicsPhase");
+  cosmicsShift = params.getParameter<double>("cosmicsShift");
+  if (cosmicsPhase) {
+    theEcalResponse->setPhaseShift(1.+cosmicsShift);
+  }
+
   EcalCorrMatrix thisMatrix;
 
   std::vector<double> corrNoiseMatrix = params.getParameter< std::vector<double> >("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 @@
 )
 
 
+