---

yaml
---
r: 64423
b: "refs/heads/CMSSW_7_1_X"
c: 93dea1b
h: "refs/heads/CMSSW_7_1_X"
i:
  64421: 9ded073
  64419: ff635e7
  64415: c11e529
v: v3

[refs]

@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 82f76fd1a3f5d9423d7c163d852a0c36647fc4ea
-"refs/heads/CMSSW_7_1_X": 864025941a966f6cf2bd8158af7fa22b278266b0
+"refs/heads/CMSSW_7_1_X": 93dea1be6d37a7a36e0e9fb8ea8dece50adf75de

trunk/SimCalorimetry/EcalSimAlgos/interface/EcalCoder.h

@@ -13,7 +13,7 @@
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 #include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalCorrelatedNoiseMatrix.h"
-#include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h"
+#include "CondFormats/EcalObjects/interface/EcalIntercalibConstantsMC.h"
 #include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
 
@@ -54,7 +54,7 @@ class EcalCoder
 
   void setFullScaleEnergy(const double EBscale , const double EEscale) {m_maxEneEB = EBscale; m_maxEneEE = EEscale; }
 
-  void setIntercalibConstants(const EcalIntercalibConstants * ical); 
+  void setIntercalibConstants(const EcalIntercalibConstantsMC * ical); 
 
   /// from EBDataFrame to CaloSamples
   virtual void digitalToAnalog(const EBDataFrame& df, CaloSamples& lf) const;
@@ -93,8 +93,8 @@ class EcalCoder
   const EcalPedestals * thePedestals;
   /// the electronics gains
   const EcalGainRatios * theGainRatios;
-  /// the intercalibration constants
-  const EcalIntercalibConstants * theIntercalibConstants;
+  /// the intercalibration constants, record specific for simulation of gain variation in MC
+  const EcalIntercalibConstantsMC * theIntercalibConstants;
   /// max attainable energy in the ecal barrel
   double m_maxEneEB ;
   /// max attainable energy in the ecal endcap

trunk/SimCalorimetry/EcalSimAlgos/src/EcalCoder.cc

@@ -31,7 +31,7 @@ void  EcalCoder::setGainRatios(const EcalGainRatios * gainRatios) {
   theGainRatios = gainRatios; 
 }
 
-void EcalCoder::setIntercalibConstants(const EcalIntercalibConstants * ical) {
+void EcalCoder::setIntercalibConstants(const EcalIntercalibConstantsMC * ical) {
   theIntercalibConstants = ical;
 } 
 
@@ -271,10 +271,10 @@ void EcalCoder::findGains(const DetId & detId, double Gains[]) const
 
 void EcalCoder::findIntercalibConstant(const DetId & detId, double & icalconst) const
 {
-  EcalIntercalibConstant thisconst = 1.;
+  EcalIntercalibConstantMC thisconst = 1.;
   // find intercalib constant for this xtal
-  const EcalIntercalibConstantMap &icalMap = theIntercalibConstants->getMap();
-  EcalIntercalibConstantMap::const_iterator icalit = icalMap.find(detId);
+  const EcalIntercalibConstantMCMap &icalMap = theIntercalibConstants->getMap();
+  EcalIntercalibConstantMCMap::const_iterator icalit = icalMap.find(detId);
   if( icalit!=icalMap.end() ){
     thisconst = (*icalit);
     if ( icalconst == 0. ) { thisconst = 1.; }

trunk/SimCalorimetry/EcalSimProducers/plugins/EcalDigiProducer.cc

@@ -11,8 +11,8 @@
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
-#include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h"
-#include "CondFormats/DataRecord/interface/EcalIntercalibConstantsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalIntercalibConstantsMC.h"
+#include "CondFormats/DataRecord/interface/EcalIntercalibConstantsMCRcd.h"
 #include "CondFormats/EcalObjects/interface/EcalADCToGeVConstant.h"
 #include "CondFormats/DataRecord/interface/EcalADCToGeVConstantRcd.h"
 #include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
@@ -272,9 +272,9 @@ void  EcalDigiProducer::checkCalibrations(const edm::EventSetup & eventSetup)
   theCoder->setPedestals( thePedestals );
 
   // Ecal Intercalibration Constants
-  edm::ESHandle<EcalIntercalibConstants> pIcal;
-  eventSetup.get<EcalIntercalibConstantsRcd>().get(pIcal);
-  const EcalIntercalibConstants *ical = pIcal.product();
+  edm::ESHandle<EcalIntercalibConstantsMC> pIcal;
+  eventSetup.get<EcalIntercalibConstantsMCRcd>().get(pIcal);
+  const EcalIntercalibConstantsMC *ical = pIcal.product();
 
   theCoder->setIntercalibConstants( ical );