minor fixes

pkurash · Sep 6, 2024 · 73d3a4a · 73d3a4a
1 parent ad83fef
commit 73d3a4a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/Detectors/Upgrades/ALICE3/FVD/base/include/FVDBase/GeometryTGeo.h b/Detectors/Upgrades/ALICE3/FVD/base/include/FVDBase/GeometryTGeo.h
@@ -32,7 +32,7 @@ namespace fvd
 class GeometryTGeo : public o2::detectors::DetMatrixCache
 {
  public:
-  GeometryTGeo(bool build, int loadTrans);
+  GeometryTGeo(bool build = false, int loadTrans = 0);
 
   void Build(int loadTrans);
   void fillMatrixCache(int mask);

diff --git a/Detectors/Upgrades/ALICE3/FVD/simulation/include/FVDSimulation/Detector.h b/Detectors/Upgrades/ALICE3/FVD/simulation/include/FVDSimulation/Detector.h
@@ -78,6 +78,8 @@ class Detector : public o2::base::DetImpl<Detector>
   TGeoVolumeAssembly* buildModuleA();
   TGeoVolumeAssembly* buildModuleC();
 
+  void defineSensitiveVolumes();
+
   /// Transient data about track passing the sensor, needed by ProcessHits()
   struct TrackData {               // this is transient
     bool mHitStarted;              //! hit creation started

diff --git a/Detectors/Upgrades/ALICE3/FVD/simulation/src/Detector.cxx b/Detectors/Upgrades/ALICE3/FVD/simulation/src/Detector.cxx
@@ -152,6 +152,7 @@ void Detector::ConstructGeometry()
 {
    createMaterials();
    buildModules();
+   defineSensitiveVolumes();
 }
 
 
@@ -237,13 +238,13 @@ TGeoVolumeAssembly* Detector::buildModuleA()
 
   for (int ir = 0; ir < FVDBaseParam::nRingsA; ir++) {
      for (int ic = 0; ic < 8; ic ++) {
-	int cellId = ic + ir;
+	int cellId = ic + 8*ir;
 	std::string tbsName = "tbs" + std::to_string(cellId);
-	std::string nodeName = "node" + std::to_string(cellId);
+	std::string nodeName = "fvd_node" + std::to_string(cellId);
 	float rmin = FVDBaseParam::rRingsA[ir];
 	float rmax = FVDBaseParam::rRingsA[ir+1];
-	float phimin = dphiDeg;
-	float phimax = dphiDeg;
+	float phimin = dphiDeg * ic;
+	float phimax = dphiDeg * (ic + 1);
 	float dz = FVDBaseParam::dzScint;
         auto tbs = new TGeoTubeSeg(tbsName.c_str(), rmin, rmax, dz, phimin, phimax);
 	auto nod = new TGeoVolume(nodeName.c_str(), tbs, medium);
@@ -264,13 +265,13 @@ TGeoVolumeAssembly* Detector::buildModuleC()
 
   for (int ir = 0; ir < FVDBaseParam::nRingsC; ir++) {
      for (int ic = 0; ic < 8; ic ++) {
-	int cellId = ic + ir + FVDBaseParam::nCellA;
+	int cellId = ic + 8*ir + FVDBaseParam::nCellA;
 	std::string tbsName = "tbs" + std::to_string(cellId);
-	std::string nodeName = "node" + std::to_string(cellId);
+	std::string nodeName = "fvd_node" + std::to_string(cellId);
 	float rmin = FVDBaseParam::rRingsC[ir];
 	float rmax = FVDBaseParam::rRingsC[ir+1];
-	float phimin = dphiDeg;
-	float phimax = dphiDeg;
+	float phimin = dphiDeg * ic;
+	float phimax = dphiDeg * (ic + 1);
 	float dz = FVDBaseParam::dzScint;
         auto tbs = new TGeoTubeSeg(tbsName.c_str(), rmin, rmax, dz, phimin, phimax);
 	auto nod = new TGeoVolume(nodeName.c_str(), tbs, medium);
@@ -280,3 +281,9 @@ TGeoVolumeAssembly* Detector::buildModuleC()
 
   return mod;
 }
+
+void Detector::defineSensitiveVolumes()
+{
+   LOG(info) << "Adding FVD Sentitive Volumes";
+
+}