Fix

Author: njacazio

ALICE3/Core/DetLayer.cxx

@@ -28,29 +28,29 @@ namespace o2::fastsim
 {
 
 // Parametric constructor
-DetLayer::DetLayer(const TString& name_,
-                   float r_,
-                   float z_,
-                   float x0_,
-                   float xrho_,
-                   float resRPhi_,
-                   float resZ_,
-                   float eff_,
-                   int type_)
-  : name(name_),
-    r(r_),
-    z(z_),
-    x0(x0_),
-    xrho(xrho_),
-    resRPhi(resRPhi_),
-    resZ(resZ_),
-    eff(eff_),
-    type(type_)
+DetLayer::DetLayer(const TString& name,
+                   float r,
+                   float z,
+                   float x0,
+                   float xrho,
+                   float resRPhi,
+                   float resZ,
+                   float eff,
+                   int type)
+  : mName(name),
+    mR(r),
+    mZ(z),
+    mX0(x0),
+    mXrho(xrho),
+    mResRPhi(resRPhi),
+    mResZ(resZ),
+    mEff(eff),
+    mType(type)
 {
 }
 
 DetLayer::DetLayer(const DetLayer& other)
-  : name(other.name), r(other.r), z(other.z), x0(other.x0), xrho(other.xrho), resRPhi(other.resRPhi), resZ(other.resZ), eff(other.eff), type(other.type)
+  : mName(other.mName), mR(other.mR), mZ(other.mZ), mX0(other.mX0), mXrho(other.mXrho), mResRPhi(other.mResRPhi), mResZ(other.mResZ), mEff(other.mEff), mType(other.mType)
 {
 }
 
@@ -60,12 +60,12 @@ void DetLayer::addDeadPhiRegion(float phiStart, float phiEnd)
   static constexpr float kPhiTolerance = 1e-4f;
   if (mDeadPhiRegions == nullptr) {
     mDeadPhiRegions = new TGraph();
-    mDeadPhiRegions->SetNameTitle(Form("deadPhiRegions_%s", name.Data()), Form("Dead phi regions for layer %s", name.Data()));
+    mDeadPhiRegions->SetNameTitle(Form("deadPhiRegions_%s", mName.Data()), Form("Dead phi regions for layer %s", mName.Data()));
     mDeadPhiRegions->AddPoint(0, kDefaultValue);
     mDeadPhiRegions->AddPoint(o2::constants::math::TwoPI, kDefaultValue);
   }
   if (phiStart < 0 || phiStart >= o2::constants::math::TwoPI || phiEnd < 0 || phiEnd >= o2::constants::math::TwoPI) {
-    LOG(fatal) << "Cannot add dead phi region with invalid range [" << phiStart << ", " << phiEnd << "] to layer " << name;
+    LOG(fatal) << "Cannot add dead phi region with invalid range [" << phiStart << ", " << phiEnd << "] to layer " << mName;
     return;
   }
   mDeadPhiRegions->AddPoint(phiStart, kDefaultValue);
@@ -77,14 +77,14 @@ void DetLayer::addDeadPhiRegion(float phiStart, float phiEnd)
 
 void DetLayer::setDeadPhiRegions(TGraph* graph)
 {
-  LOG(debug) << "Setting dead phi regions for layer " << name << " with graph " << (graph ? graph->GetName() : "nullptr");
+  LOG(debug) << "Setting dead phi regions for layer " << mName << " with graph " << (graph ? graph->GetName() : "nullptr");
   if (mDeadPhiRegions != nullptr) {
-    LOG(warning) << "Overriding existing dead phi regions for layer " << name;
+    LOG(warning) << "Overriding existing dead phi regions for layer " << mName;
     delete mDeadPhiRegions;
   }
   mDeadPhiRegions = graph;
   if (mDeadPhiRegions->GetN() == 0) {
-    LOG(warning) << "Dead phi regions graph for layer " << name << " is empty, clearing dead regions";
+    LOG(warning) << "Dead phi regions graph for layer " << mName << " is empty, clearing dead regions";
     mDeadPhiRegions = nullptr;
     return; // cleared the dead regions
   }
@@ -95,42 +95,42 @@ void DetLayer::setDeadPhiRegions(TGraph* graph)
       const float y = mDeadPhiRegions->GetY()[i];
       // First point has to be at 0, last point has to be at 2PI
       if ((i == 0 && x != 0.f) || (i == mDeadPhiRegions->GetN() - 1 && x != o2::constants::math::TwoPI)) {
-        LOG(fatal) << "Dead phi regions graph for layer " << name << " has invalid x value " << x << " at point " << i << ", first point should be 0 and last point should be 2PI";
+        LOG(fatal) << "Dead phi regions graph for layer " << mName << " has invalid x value " << x << " at point " << i << ", first point should be 0 and last point should be 2PI";
       }
       LOG(debug) << "Point " << i << ": (" << x << ", " << y << ")";
       if (x < 0 || x > o2::constants::math::TwoPI) {
-        LOG(fatal) << "Dead phi regions graph for layer " << name << " has invalid x value " << x << " at point " << i;
+        LOG(fatal) << "Dead phi regions graph for layer " << mName << " has invalid x value " << x << " at point " << i;
       }
       if (y != 0.f && y != 2.f) {
-        LOG(fatal) << "Dead phi regions graph for layer " << name << " has invalid y value " << y << " at point " << i << ", should be 0 or 2";
+        LOG(fatal) << "Dead phi regions graph for layer " << mName << " has invalid y value " << y << " at point " << i << ", should be 0 or 2";
       }
     }
   } else {
-    LOG(info) << "Cleared dead phi regions for layer " << name;
+    LOG(info) << "Cleared dead phi regions for layer " << mName;
   }
 }
 
 std::string DetLayer::toString() const
 {
   std::string out = "";
   out.append("DetLayer: ");
-  out.append(name.Data());
+  out.append(mName.Data());
   out.append(" | r: ");
-  out.append(std::to_string(r));
+  out.append(std::to_string(mR));
   out.append(" cm | z: ");
-  out.append(std::to_string(z));
+  out.append(std::to_string(mZ));
   out.append(" cm | x0: ");
-  out.append(std::to_string(x0));
+  out.append(std::to_string(mX0));
   out.append(" cm | xrho: ");
-  out.append(std::to_string(xrho));
+  out.append(std::to_string(mXrho));
   out.append(" g/cm^3 | resRPhi: ");
-  out.append(std::to_string(resRPhi));
+  out.append(std::to_string(mResRPhi));
   out.append(" cm | resZ: ");
-  out.append(std::to_string(resZ));
+  out.append(std::to_string(mResZ));
   out.append(" cm | eff: ");
-  out.append(std::to_string(eff));
+  out.append(std::to_string(mEff));
   out.append(" | type: ");
-  switch (type) {
+  switch (mType) {
     case kLayerInert:
       out.append("Inert");
       break;