Modified default parameters

Author: pkurash

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

@@ -23,14 +23,15 @@ namespace fd
 {
 struct Constants {
   static constexpr int nsect = 8;
-  static constexpr int nringsA = 5;
+  static constexpr int nringsA = 3;
   static constexpr int nringsC = 6;
 
   static constexpr float etaMax = 7.0f;
-  static constexpr float etaMin = 4.0f;
+  static constexpr float etaMinC = 4.0f;
+  static constexpr float etaMinA = 5.0f;
 
-  static constexpr int nringsA_withFCT = 3;
-  static constexpr float etaMinA_withFCT = 5.0f;
+  static constexpr int nringsA_noFCT = 5;
+  static constexpr float etaMinA_noFCT = 4.0f;
 };
 
 } // namespace fd

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

@@ -23,10 +23,10 @@ namespace fd
 struct FDBaseParam : public o2::conf::ConfigurableParamHelper<FDBaseParam> {
 
   float zmodA = 1700.0f;
-  float zmodC = -1950.0f;
+  float zmodC = -1850.0f;
   float dzscint = 4.0f;
 
-  bool withFCT = true;
+  bool noFCT = false;
 
   O2ParamDef(FDBaseParam, "FDBase");
 };

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

@@ -108,7 +108,8 @@ class Detector : public o2::base::DetImpl<Detector>
   std::vector<float> mRingRadiiA = {};
   std::vector<float> mRingRadiiC = {};
 
-  float mEtaMax, mEtaMin, mEtaMinA;
+  float mEtaMax;
+  float mEtaMinC, mEtaMinA;
   float mZmodA;
   float mZmodC;
 

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

@@ -59,16 +59,16 @@ Detector::Detector(bool active)
   mNumberOfSectors = Constants::nsect;
 
   mEtaMax = Constants::etaMax;
-  mEtaMin = Constants::etaMin;
+  mEtaMinC = Constants::etaMinC;
 
   auto& baseParam = FDBaseParam::Instance();
 
-  if (baseParam.withFCT) {
-    mNumberOfRingsA = Constants::nringsA_withFCT;
-    mEtaMinA = Constants::etaMinA_withFCT;
+  if (baseParam.noFCT) {
+    mNumberOfRingsA = Constants::nringsA_noFCT;
+    mEtaMinA = Constants::etaMinA_noFCT;
   } else {
     mNumberOfRingsA = Constants::nringsA;
-    mEtaMinA = mEtaMin;
+    mEtaMinA = Constants::etaMinA;
   }
 
   mDzScint = baseParam.dzscint / 2;
@@ -82,7 +82,7 @@ Detector::Detector(bool active)
   }
 
   for (int i = 0; i <= mNumberOfRingsC + 1; i++) {
-    float eta = -mEtaMax + i * (mEtaMax - mEtaMin) / mNumberOfRingsC;
+    float eta = -mEtaMax + i * (mEtaMax - mEtaMinC) / mNumberOfRingsC;
     float r = ringRadius(mZmodC, eta);
     mRingRadiiC.emplace_back(r);
   }