roll back some of the conversion float/double

Author: mariadalfonso

RecoLocalCalo/HcalRecAlgos/interface/PulseShapeFunctor.h

@@ -8,7 +8,7 @@ namespace HcalConst{
    constexpr int maxSamples = 10;
    constexpr int maxPSshapeBin = 256;
    constexpr int nsPerBX = 25;
-   constexpr double iniTimeShift = 92.5;
+   constexpr float iniTimeShift = 92.5f;
    constexpr double invertnsPerBx = 0.04;
    constexpr int shiftTS = 4;
 
@@ -48,12 +48,12 @@ namespace FitterFuncs{
      }
 
    private:
-     std::array<double,HcalConst::maxPSshapeBin> pulse_hist;
+     std::array<float,HcalConst::maxPSshapeBin> pulse_hist;
 
      int cntNANinfit;
-     std::vector<double> acc25nsVec, diff25nsItvlVec;
-     std::vector<double> accVarLenIdxZEROVec, diffVarItvlIdxZEROVec;
-     std::vector<double> accVarLenIdxMinusOneVec, diffVarItvlIdxMinusOneVec;
+     std::vector<float> acc25nsVec, diff25nsItvlVec;
+     std::vector<float> accVarLenIdxZEROVec, diffVarItvlIdxZEROVec;
+     std::vector<float> accVarLenIdxMinusOneVec, diffVarItvlIdxMinusOneVec;
 
      void funcShape(std::array<double,HcalConst::maxSamples> & ntmpbin, const double pulseTime, const double pulseHeight,const double slew);
      double psFit_x[HcalConst::maxSamples], psFit_y[HcalConst::maxSamples], psFit_erry[HcalConst::maxSamples], psFit_erry2[HcalConst::maxSamples], psFit_slew[HcalConst::maxSamples];

RecoLocalCalo/HcalRecAlgos/src/PulseShapeFunctor.cc

@@ -68,7 +68,7 @@ namespace FitterFuncs{
     int i_start         = ( -HcalConst::iniTimeShift - pulseTime - slew >0 ? 0 : (int)std::abs(-HcalConst::iniTimeShift-pulseTime-slew) + 1);
     double offset_start = i_start - HcalConst::iniTimeShift - pulseTime - slew; //-199-2*pars[0]-2.*slew (for pars[0] > 98.5) or just -98.5-pars[0]-slew;
     // zeroing output binned pulse shape
-    ntmpbin.fill(0.0);
+    ntmpbin.fill(0.0f);
 
     if( edm::isNotFinite(offset_start) ){ //Check for nan
       ++ cntNANinfit;