modified constants and configuration file

Author: pkurash

Detectors/Upgrades/ALICE3/FD3/base/include/FD3Base/Constants.h

@@ -48,15 +48,6 @@ struct Constants {
   static constexpr float etaMax_cher_v2  = 7.0f;
   static constexpr float zscint_v2 = 1500.0f;
   static constexpr float zcher_v2  = 1560.0f;
-
-//  static constexpr float etaMin_scintA_v3 = 2.0f;
-//  static constexpr float etaMax_scintA_v3 = 5.0f;
-//  static constexpr float etaMin_scintC_v3 = -4.9f;
-//  static constexpr float etaMax_scintC_v3 = -2.5f;
-//  static constexpr float etaMin_cher_v3  = 5.0f;
-//  static constexpr float etaMax_cher_v3  = 7.0f;
-//   static constexpr float zscint_v3 = 410.0f;
-//   static constexpr float zcher_v3  = 1560.0f;
 };
 
 } // namespace fd3

Detectors/Upgrades/ALICE3/FD3/base/include/FD3Base/FD3BaseParam.h

@@ -22,28 +22,8 @@ namespace o2
 namespace fd3
 {
 
-
-
 struct FD3BaseParam : public o2::conf::ConfigurableParamHelper<FD3BaseParam> {
 
-//  float zmodAC = 1500.0f;
-//  float zmodAC_extra = 400.0f;
-
-//  float dzscint = 4.0f;
-//  float dzcher  = 4.0f;
-
-//  float zscint_v1 = 370.0f;
-//  float zscint_v2 = 1500.0f;
-//  float zscint_v3 = 370.0f;
-
-// float zcher_v1 = 430.0f;
-//  float zcher_v2 = 1560.0f;
-//  float zcher_v3 = 1560.0f;
-
-//  enum FD3GeoVersion {
-//    v1 = 1, v2, v3
-//  };
-//  enum FD3GeoVersion geoVersion = v1;
   unsigned int geoVersion = 1; // 1, 2 or 3;
 
   O2ParamDef(FD3BaseParam, "FD3Base");

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

@@ -119,6 +119,8 @@ Detector::Detector(bool active)
       mTopVolumeNameScint = "barrel";
       mTopVolumeNameCher = "cave";
       break;
+   default:
+      LOG(fatal) << "The version number should be either 1, 2 or 3!";
   }
 
 }
@@ -157,6 +159,7 @@ void Detector::InitializeO2Detector()
   LOG(info) << "Initialize Forward Detector";
   mGeometryTGeo = GeometryTGeo::Instance();
   defineSensitiveVolumes();
+  definePassiveVolumes();    
 }
 
 bool Detector::ProcessHits(FairVolume* vol)
@@ -353,15 +356,15 @@ void Detector::buildModules()
 
 TGeoVolumeAssembly* Detector::buildModuleScintA()
 {
-  TGeoVolumeAssembly* mod = new TGeoVolumeAssembly("FD3_ScintA");
+  auto mod = new TGeoVolumeAssembly("FD3_ScintA");
 
   const TGeoMedium* medium = gGeoManager->GetMedium("FD3_Scintillator");
 
   float dphiDeg = 360. / mNumberOfSectors;
 
   for (int ir = 0; ir < mNumberOfRingsScint; ir++) {
     std::string rName = "fd3_ring" + std::to_string(ir + 1);
-    TGeoVolumeAssembly* ring = new TGeoVolumeAssembly(rName.c_str());
+    auto ring = new TGeoVolumeAssembly(rName.c_str());
     float etaMin = mEtaMaxScintA - (ir + 1) * (mEtaMaxScintA - mEtaMinScintA) / mNumberOfRingsScint;
     float etaMax = mEtaMaxScintA - ir * (mEtaMaxScintA - mEtaMinScintA) / mNumberOfRingsScint;
     float zmod = mZScintA;
@@ -389,15 +392,15 @@ TGeoVolumeAssembly* Detector::buildModuleScintA()
 
 TGeoVolumeAssembly* Detector::buildModuleScintC()
 {
-  TGeoVolumeAssembly* mod = new TGeoVolumeAssembly("FD3_ScintC");
+  auto mod = new TGeoVolumeAssembly("FD3_ScintC");
 
   const TGeoMedium* medium = gGeoManager->GetMedium("FD3_Scintillator");
 
   float dphiDeg = 360. / mNumberOfSectors;
 
   for (int ir = 0; ir < mNumberOfRingsScint; ir++) {
     std::string rName = "fd3_ring" + std::to_string(ir + 1 + mNumberOfRingsScint);
-    TGeoVolumeAssembly* ring = new TGeoVolumeAssembly(rName.c_str());
+    auto ring = new TGeoVolumeAssembly(rName.c_str());
     float etaMin = mEtaMinScintC + ir * (mEtaMaxScintC - mEtaMinScintC) / mNumberOfRingsScint;
     float etaMax = mEtaMinScintC + (ir + 1) * (mEtaMaxScintC - mEtaMinScintC) / mNumberOfRingsScint;
     float zmod = mZScintC;
@@ -425,15 +428,15 @@ TGeoVolumeAssembly* Detector::buildModuleScintC()
 
 TGeoVolumeAssembly* Detector::buildModuleCherA()
 {
-  TGeoVolumeAssembly* mod = new TGeoVolumeAssembly("FD3_CherA");
+  auto mod = new TGeoVolumeAssembly("FD3_CherA");
 
   const TGeoMedium* medium = gGeoManager->GetMedium("FD3_Glass");
 
   float dphiDeg = 360.;// / mNumberOfSectors;
 
   for (int ir = 0; ir < mNumberOfRingsCher; ir++) {
     std::string rName = "fd3_ring" + std::to_string(ir + 1 + 2 * mNumberOfRingsScint);
-    TGeoVolumeAssembly* ring = new TGeoVolumeAssembly(rName.c_str());
+    auto ring = new TGeoVolumeAssembly(rName.c_str());
     float etaMin = mEtaMaxCherA - (ir + 1) * (mEtaMaxCherA - mEtaMinCherA) / mNumberOfRingsCher;
     float etaMax = mEtaMaxCherA - ir * (mEtaMaxCherA - mEtaMinCherA) / mNumberOfRingsCher;
     float zmod = mZCherA;
@@ -461,15 +464,15 @@ TGeoVolumeAssembly* Detector::buildModuleCherA()
 
 TGeoVolumeAssembly* Detector::buildModuleCherC()
 {
-  TGeoVolumeAssembly* mod = new TGeoVolumeAssembly("FD3_CherC");
+  auto mod = new TGeoVolumeAssembly("FD3_CherC");
 
   const TGeoMedium* medium = gGeoManager->GetMedium("FD3_Glass");
 
   float dphiDeg = 360.;// / mNumberOfSectors;
 
   for (int ir = 0; ir < mNumberOfRingsCher; ir++) {
     std::string rName = "fd3_ring" + std::to_string(ir + 1 + 2 * mNumberOfRingsScint + mNumberOfRingsCher);
-    TGeoVolumeAssembly* ring = new TGeoVolumeAssembly(rName.c_str());
+    auto ring = new TGeoVolumeAssembly(rName.c_str());
     float etaMin = mEtaMinCherC + ir * (mEtaMaxCherC - mEtaMinCherC) / mNumberOfRingsCher;
     float etaMax = mEtaMinCherC + (ir + 1) * (mEtaMaxCherC - mEtaMinCherC) / mNumberOfRingsCher;
     float zmod = mZCherC;
@@ -501,18 +504,23 @@ void Detector::defineSensitiveVolumes()
 
   TGeoVolume* v;
 
-  int nCells = 2 * (mNumberOfRingsScint +  mNumberOfRingsCher) * mNumberOfSectors;
+  int nCells = 2 * mNumberOfRingsScint * mNumberOfSectors + 2 * mNumberOfRingsCher;
 
   for (int iv = 0; iv < nCells; iv++) {
     TString volumeName = "fd3_node" + std::to_string(iv);
     v = gGeoManager->GetVolume(volumeName);
     //LOG(info) << "Adding sensitive volume " << v->GetName();
-    LOG(info) << "Adding sensitive volume nr " << iv << " out of " << nCells;
+    //LOG(info) << "Adding sensitive volume nr " << iv << " out of " << nCells;
     AddSensitiveVolume(v);
   }
 
 }
 
+void Detector::definePassiveVolumes()
+{
+   // To be added later
+}
+
 float Detector::getRingSize(float z, float eta)
 {
   return z * TMath::Tan(2 * TMath::ATan(TMath::Exp(-eta)));