Slew Correction fo CC + parameters to use this correction in EB &/or EE v2

Author: jking79

RecoLocalCalo/EcalRecAlgos/src/EcalUncalibRecHitTimingCCAlgo.cc

@@ -17,11 +17,8 @@ double EcalUncalibRecHitTimingCCAlgo::computeTimeCC(const EcalDataFrame& dataFra
   double maxamplitude = -std::numeric_limits<double>::max();
   float pulsenorm = 0.;
 
-  bool doOOTAmpCorrection(correctForOOT);
   std::vector<float> pedSubSamples(nsample);
   std::vector<float> weights(nsample,1.f);
-  float minADC = (dataFrame.sample(0)).adc();
-  for (unsigned int iSample = 1; iSample < nsample; iSample++) { if( (dataFrame.sample(iSample)).adc() < minADC ) minADC = (dataFrame.sample(iSample)).adc(); }
   for (unsigned int iSample = 0; iSample < nsample; iSample++) {
     const EcalMGPASample& sample = dataFrame.sample(iSample);
 
@@ -51,6 +48,8 @@ double EcalUncalibRecHitTimingCCAlgo::computeTimeCC(const EcalDataFrame& dataFra
 
     pedSubSamples[iSample] = amplitude;
 
+    pulsenorm += fullpulse(iSample);
+
     if (amplitude > maxamplitude) {
       maxamplitude = amplitude;
     }
@@ -64,7 +63,7 @@ double EcalUncalibRecHitTimingCCAlgo::computeTimeCC(const EcalDataFrame& dataFra
 
   }
 
-  if( doOOTAmpCorrection ){
+  if( correctForOOT ){
     int ipulse = -1;
     for (auto const& amplit : amplitudes) {
       ipulse++;
@@ -112,8 +111,7 @@ double EcalUncalibRecHitTimingCCAlgo::computeTimeCC(const EcalDataFrame& dataFra
 
   float tM = (t3 + t0) / 2 - GLOBAL_TIME_SHIFT;
   if (counter < MIN_NUM_OF_ITERATIONS || counter > MAX_NUM_OF_ITERATIONS - 1) { tM = TIME_WHEN_NOT_CONVERGING * ecalPh1::Samp_Period; }
-  float cct = -tM / ecalPh1::Samp_Period;
-  return cct;
+  return -tM / ecalPh1::Samp_Period;
 }
 
 FullSampleVector EcalUncalibRecHitTimingCCAlgo::interpolatePulse(const FullSampleVector& fullpulse,

RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.cc

@@ -522,7 +522,6 @@ void EcalUncalibRecHitWorkerMultiFit::run(const edm::Event& evt,
       // === time computation ===
       if (timealgo_ == ratioMethod) {
         // ratio method
-        //std::cout << " Using Ratio method !!!!!!!!!!! " << std::endl;
         constexpr float clockToNsConstant = 25.;
         constexpr float invClockToNs = 1. / clockToNsConstant;
         if (not barrel) {
@@ -770,8 +769,8 @@ edm::ParameterSetDescription EcalUncalibRecHitWorkerMultiFit::getAlgoDescription
                                                              true) and
               edm::ParameterDescription<std::vector<double>>("EBamplitudeFitParameters", {1.138, 1.652}, true) and
               edm::ParameterDescription<std::vector<double>>("EEamplitudeFitParameters", {1.890, 1.400}, true) and
-              edm::ParameterDescription<edm::ESInputTag>("timeCalibTag", edm::ESInputTag(":CC"), true) and
-              edm::ParameterDescription<edm::ESInputTag>("timeOffsetTag", edm::ESInputTag(":CC"), true) and
+              edm::ParameterDescription<edm::ESInputTag>("timeCalibTag", edm::ESInputTag(), true) and
+              edm::ParameterDescription<edm::ESInputTag>("timeOffsetTag", edm::ESInputTag(), true) and
               edm::ParameterDescription<double>("EBtimeFitLimits_Lower", 0.2, true) and
               edm::ParameterDescription<double>("EBtimeFitLimits_Upper", 1.4, true) and
               edm::ParameterDescription<double>("EEtimeFitLimits_Lower", 0.2, true) and