calculate average only once

Author: glegras

DataFormats/Detectors/TRD/include/DataFormatsTRD/CalGain.h

@@ -33,14 +33,17 @@ class CalGain
 
   void setMPVdEdx(int iDet, float mpv) { mMPVdEdx[iDet] = mpv; }
 
-  float getMPVdEdx(int iDet, bool defaultAvg = false) const
+  float getMPVdEdx(int iDet, bool defaultAvg = true) const
   {
     // if defaultAvg = false, we take the value stored whatever it is
     // if defaultAvg = true and we have default value or bad value stored, we take the average on all chambers instead
     if (!defaultAvg || isGoodGain(iDet))
       return mMPVdEdx[iDet];
-    else
-      return getAverageGain();
+    else 
+    {
+      if (TMath::Abs(mMeanGain + 999.) < 1e-6) mMeanGain = getAverageGain();
+      return mMeanGain;
+    }
   }
 
   float getAverageGain() const
@@ -73,6 +76,7 @@ class CalGain
 
  private:
   std::array<float, constants::MAXCHAMBER> mMPVdEdx{}; ///< Most probable value of dEdx distribution per TRD chamber
+  mutable float mMeanGain{-999.};                       ///! average gain, calculated only once
 
   ClassDefNV(CalGain, 2);
 };

DataFormats/Detectors/TRD/include/DataFormatsTRD/CalVdriftExB.h

@@ -34,21 +34,27 @@ class CalVdriftExB
   void setVdrift(int iDet, float vd) { mVdrift[iDet] = vd; }
   void setExB(int iDet, float exb) { mExB[iDet] = exb; }
 
-  float getVdrift(int iDet, bool defaultAvg = false) const
+  float getVdrift(int iDet, bool defaultAvg = true) const
   {
     // if defaultAvg = false, we take the value stored whatever it is
     // if defaultAvg = true and we have default value or bad value stored, we take the average on all chambers instead
     if (!defaultAvg || (isGoodExB(iDet) && isGoodVdrift(iDet)))
       return mVdrift[iDet];
-    else
-      return getAverageVdrift();
+    else 
+    {
+      if (TMath::Abs(mMeanVdrift + 999.) < 1e-6) mMeanVdrift = getAverageVdrift();
+      return mMeanVdrift;
+    }
   }
-  float getExB(int iDet, bool defaultAvg = false) const
+  float getExB(int iDet, bool defaultAvg = true) const
   {
     if (!defaultAvg || (isGoodExB(iDet) && isGoodVdrift(iDet)))
       return mExB[iDet];
-    else
-      return getAverageExB();
+    else 
+    {
+      if (TMath::Abs(mMeanExB + 999.) < 1e-6) mMeanExB = getAverageExB();
+      return mMeanExB;
+    }
   }
 
   float getAverageVdrift() const
@@ -120,6 +126,8 @@ class CalVdriftExB
  private:
   std::array<float, constants::MAXCHAMBER> mVdrift{}; ///< calibrated drift velocity per TRD chamber
   std::array<float, constants::MAXCHAMBER> mExB{};    ///< calibrated Lorentz angle per TRD chamber
+  mutable float mMeanVdrift{-999.};                   ///! average drift velocity, calculated only once
+  mutable float mMeanExB{-999.};                      ///! average lorentz angle, calculated only once
 
   ClassDefNV(CalVdriftExB, 2);
 };

Detectors/Align/Workflow/src/BarrelAlignmentSpec.cxx

@@ -307,11 +307,7 @@ void BarrelAlignmentSpec::finaliseCCDB(o2::framework::ConcreteDataMatcher& match
   }
   if (matcher == ConcreteDataMatcher("TRD", "CALVDRIFTEXB", 0)) {
     LOG(info) << "CalVdriftExB object has been updated";
-    for (int iDet = 0; iDet < o2::trd::constants::MAXCHAMBER; iDet++) {
-      // set to average value if the calibration is not correct
-      mTRDTransformer->setVdrift(iDet, ((const o2::trd::CalVdriftExB*)obj)->getVdrift(iDet, true));
-      mTRDTransformer->setExB(iDet, ((const o2::trd::CalVdriftExB*)obj)->getExB(iDet, true));
-    }
+    mTRDTransformer->setCalVdriftExB((const o2::trd::CalVdriftExB*)obj);
     return;
   }
   if (mTPCVDriftHelper.accountCCDBInputs(matcher, obj)) {

Detectors/TRD/base/include/TRDBase/TrackletTransformer.h

@@ -30,8 +30,7 @@ class TrackletTransformer
 
   void init();
 
-  void setVdrift(int iDet, float vd) { mVdrift[iDet] = vd; }
-  void setExB(int iDet, float exb) { mExB[iDet] = exb; }
+  void setCalVdriftExB(const CalVdriftExB* cal) { mCalVdriftExB = cal; };
   void setApplyXOR() { mApplyXOR = true; }
   void setApplyShift(bool f) { mApplyShift = f; }
   bool isShiftApplied() const { return mApplyShift; }
@@ -55,8 +54,7 @@ class TrackletTransformer
 
   float mXAnode;
 
-  std::array<float, constants::MAXCHAMBER> mVdrift{};
-  std::array<float, constants::MAXCHAMBER> mExB{};
+  const CalVdriftExB* mCalVdriftExB{nullptr};
 };
 
 } // namespace trd

Detectors/TRD/base/src/TrackletTransformer.cxx

@@ -40,8 +40,8 @@ float TrackletTransformer::calculateDy(int detector, int slope, const PadPlane*
 {
   double padWidth = padPlane->getWidthIPad();
 
-  float vDrift = mVdrift[detector];
-  float exb = mExB[detector];
+  float vDrift = mCalVdriftExB->getVdrift(detector);
+  float exb = mCalVdriftExB->getExB(detector);
 
   // dy = slope * nTimeBins * padWidth * GRANULARITYTRKLSLOPE;
   // nTimeBins should be number of timebins in drift region. 1 timebin is 100 nanosecond
@@ -125,7 +125,7 @@ CalibratedTracklet TrackletTransformer::transformTracklet(Tracklet64 tracklet, b
 double TrackletTransformer::getTimebin(int detector, double x) const
 {
   // calculate timebin from x position within chamber
-  float vDrift = mVdrift[detector];
+  float vDrift = mCalVdriftExB->getVdrift(detector);
   double t0 = 4.0; // time (in timebins) of start of drift region
 
   double timebin;

Detectors/TRD/workflow/src/TRDTrackletTransformerSpec.cxx

@@ -141,11 +141,7 @@ void TRDTrackletTransformerSpec::finaliseCCDB(ConcreteDataMatcher& matcher, void
   }
   if (matcher == ConcreteDataMatcher("TRD", "CALVDRIFTEXB", 0)) {
     LOG(info) << "CalVdriftExB object has been updated";
-    for (int iDet = 0; iDet < constants::MAXCHAMBER; iDet++) {
-      // set to average value if the calibration is not correct
-      mTransformer.setVdrift(iDet, ((const o2::trd::CalVdriftExB*)obj)->getVdrift(iDet, true));
-      mTransformer.setExB(iDet, ((const o2::trd::CalVdriftExB*)obj)->getExB(iDet, true));
-    }
+    mTransformer.setCalVdriftExB((const o2::trd::CalVdriftExB*)obj);
     return;
   }
 }