Add LumiIDC data member to TPCFastTransform

Author: shahor02

GPU/TPCFastTransformation/TPCFastTransform.cxx

@@ -37,7 +37,7 @@
 using namespace GPUCA_NAMESPACE::gpu;
 
 TPCFastTransform::TPCFastTransform()
-  : FlatObject(), mTimeStamp(0), mCorrection(), mApplyCorrection(1), mT0(0.f), mVdrift(0.f), mVdriftCorrY(0.f), mLdriftCorr(0.f), mTOFcorr(0.f), mPrimVtxZ(0.f), mLumi(0.f), mLumiError(0.f), mLumiScaleFactor(1.0f)
+  : FlatObject(), mTimeStamp(0), mCorrection(), mApplyCorrection(1), mT0(0.f), mVdrift(0.f), mVdriftCorrY(0.f), mLdriftCorr(0.f), mTOFcorr(0.f), mPrimVtxZ(0.f), mLumiIDC(0.f), mLumi(0.f), mLumiError(0.f), mLumiScaleFactor(1.0f)
 {
   // Default Constructor: creates an empty uninitialized object
 }
@@ -58,6 +58,7 @@ void TPCFastTransform::cloneFromObject(const TPCFastTransform& obj, char* newFla
   mLdriftCorr = obj.mLdriftCorr;
   mTOFcorr = obj.mTOFcorr;
   mPrimVtxZ = obj.mPrimVtxZ;
+  mLumiIDC = obj.mLumiIDC;
   mLumi = obj.mLumi;
   mLumiError = obj.mLumiError;
   mLumiScaleFactor = obj.mLumiScaleFactor;
@@ -108,6 +109,7 @@ void TPCFastTransform::startConstruction(const TPCFastSpaceChargeCorrection& cor
   mLdriftCorr = 0.f;
   mTOFcorr = 0.f;
   mPrimVtxZ = 0.f;
+  mLumiIDC = 0.f;
   mLumi = 0.f;
   mLumiError = 0.f;
   mLumiScaleFactor = 1.f;
@@ -158,6 +160,7 @@ void TPCFastTransform::print() const
   LOG(info) << "mLdriftCorr = " << mLdriftCorr;
   LOG(info) << "mTOFcorr = " << mTOFcorr;
   LOG(info) << "mPrimVtxZ = " << mPrimVtxZ;
+  LOG(info) << "mLumiIDC = " << mLumiIDC;
   LOG(info) << "mLumi = " << mLumi;
   LOG(info) << "mLumiError = " << mLumiError;
   LOG(info) << "mLumiScaleFactor = " << mLumiScaleFactor;

GPU/TPCFastTransformation/TPCFastTransform.h

@@ -162,6 +162,7 @@ class TPCFastTransform : public FlatObject
 
   /// Set Lumi info
   void setLumi(float l) { mLumi = l; }
+  void setLumiIDC(float l) { mLumiIDC = l; }
   void setLumiError(float e) { mLumiError = e; }
   void setLumiScaleFactor(float s) { mLumiScaleFactor = s; }
 
@@ -256,6 +257,9 @@ class TPCFastTransform : public FlatObject
   /// Return map lumi
   GPUd() float getLumi() const { return mLumi; }
 
+  /// Return map lumiIDC
+  GPUd() float getLumiIDC() const { return mLumiIDC; }
+
   /// Return map lumi error
   GPUd() float getLumiError() const { return mLumiError; }
 
@@ -335,6 +339,7 @@ class TPCFastTransform : public FlatObject
 
   float mPrimVtxZ; ///< Z of the primary vertex, needed for the Time-Of-Flight correction
 
+  float mLumiIDC;         ///< luminosity estimator in IDC units
   float mLumi;            ///< luminosity estimator
   float mLumiError;       ///< error on luminosity
   float mLumiScaleFactor; ///< user correction factor for lumi (e.g. normalization, efficiency correction etc.)
@@ -345,7 +350,7 @@ class TPCFastTransform : public FlatObject
   GPUd() void TransformInternal(int slice, int row, float& u, float& v, float& x, const TPCFastTransform* ref, const TPCFastTransform* ref2, float scale, float scale2, int scaleMode) const;
 
 #ifndef GPUCA_ALIROOT_LIB
-  ClassDefNV(TPCFastTransform, 3);
+  ClassDefNV(TPCFastTransform, 4);
 #endif
 };