updated eta min/max definitions

Author: pkurash

Detectors/Upgrades/ALICE3/FD/base/include/FDBase/Constants.h

@@ -27,8 +27,7 @@ struct Constants {
   static constexpr unsigned int nringsC = 6;
 
   static constexpr float etaMax = 7.0f;
-  static constexpr float etaMinC = 4.0f;
-  static constexpr float etaMinA = 5.0f;
+  static constexpr float etaMin = 4.0f;
 
   static constexpr unsigned int nringsA_withMG = 3;
   static constexpr float etaMinA_withMG = 5.0f;

Detectors/Upgrades/ALICE3/FD/simulation/include/FDSimulation/Detector.h

@@ -108,10 +108,9 @@ class Detector : public o2::base::DetImpl<Detector>
   std::vector<float> mRingRadiiA = {};
   std::vector<float> mRingRadiiC = {};
 
-  float mEtaMax;
-  float mEtaMinC, mEtaMinA;
-  float mZmodA;
-  float mZmodC;
+  float mEtaMaxA, mEtaMaxC;
+  float mEtaMinA, mEtaMinC;
+  float mZmodA, mZmodC;
 
   void defineSensitiveVolumes();
 

Detectors/Upgrades/ALICE3/FD/simulation/src/Detector.cxx

@@ -58,8 +58,10 @@ Detector::Detector(bool active)
   mNumberOfRingsC = Constants::nringsC;
   mNumberOfSectors = Constants::nsect;
 
-  mEtaMax = Constants::etaMax;
-  mEtaMinC = Constants::etaMinC;
+  mEtaMinA = Constants::etaMin;
+  mEtaMaxA = Constants::etaMax;
+  mEtaMinC = -Constants::etaMax;
+  mEtaMaxC = -Constants::etaMin;
 
   auto& baseParam = FDBaseParam::Instance();
 
@@ -68,21 +70,21 @@ Detector::Detector(bool active)
     mEtaMinA = Constants::etaMinA_withMG;
   } else {
     mNumberOfRingsA = Constants::nringsA;
-    mEtaMinA = Constants::etaMinA;
+    mEtaMinA = Constants::etaMin;
   }
 
   mDzScint = baseParam.dzscint / 2;
   mZmodA = baseParam.zmodA;
   mZmodC = baseParam.zmodC;
 
   for (int i = 0; i <= mNumberOfRingsA + 1; i++) {
-    float eta = mEtaMax - i * (mEtaMax - mEtaMinA) / mNumberOfRingsA;
+    float eta = mEtaMaxA - i * (mEtaMaxA - mEtaMinA) / mNumberOfRingsA;
     float r = ringRadius(mZmodA, eta);
     mRingRadiiA.emplace_back(r);
   }
 
   for (int i = 0; i <= mNumberOfRingsC + 1; i++) {
-    float eta = -mEtaMax + i * (mEtaMax - mEtaMinC) / mNumberOfRingsC;
+    float eta = mEtaMaxC - i * (mEtaMaxC - mEtaMinC) / mNumberOfRingsC;
     float r = ringRadius(mZmodC, eta);
     mRingRadiiC.emplace_back(r);
   }