ALICE3-TRK: adding staves getters in GeometryTGeo

Author: atriolo

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h

@@ -73,10 +73,23 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   void Print(Option_t* opt = "") const;
 
   int getLayer(int index) const;
+  int getStave(int index) const;
   int getSubDetID(int index) const;
   int getPetalCase(int index) const;
   int getDisk(int index) const;
 
+  int getLastChipIndex(int lay) const { return mLastChipIndex[lay]; }
+  int getFirstChipIndex(int lay, int petalcase, int subDetID) const
+  {
+    /// Get the first chip index of the active petal (VD) or layer (MLOT)
+    if (subDetID == 0) { // VD
+      return (petalcase == 0) ? 0 : mLastChipIndexVD[petalcase - 1] + 1;
+    } else if (subDetID == 1) { // MLOT
+      return mLastChipIndex[lay + mNumberOfPetalsVD - 1] + 1;
+    }
+    return -1; // not found
+  }
+
   /// Get the transformation matrix of the SENSOR (not necessary the same as the chip)
   /// for a given chip 'index' by quering the TGeoManager
   TGeoHMatrix* extractMatrixSensor(int index) const;

Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx

@@ -54,9 +54,9 @@ GeometryTGeo::GeometryTGeo(bool build, int loadTrans) : DetMatrixCache(detectors
 void GeometryTGeo::Build(int loadTrans)
 {
   ///// current geometry organization:
-  ///// total elements = 44 = 8 layers ML+OT + 4 petal cases * (3 layers + 6 disks)
+  ///// total elements = 258 = x staves * 8 layers ML+OT + 4 petal cases * (3 layers + 6 disks)
   ///// indexing from 0 to 35: VD petals -> layers -> disks
-  ///// indexing from 36 to 43: MLOT layers
+  ///// indexing from 36 to 257: MLOT staves
 
   if (isBuilt()) {
     LOGP(warning, "Already built");
@@ -99,13 +99,14 @@ void GeometryTGeo::Build(int loadTrans)
 
   /// filling the information for the MLOT
   for (int i = 0; i < mNumberOfLayersMLOT; i++) {
-    mNumberOfChipsPerLayerMLOT[i] = 1; /// for the moment, considering 1 layer = 1 chip. TODO: do first 1 stave =  1 chip and then add the final segmentation
+    mNumberOfChipsPerLayerMLOT[i] = extractNumberOfStavesMLOT(i); // for the moment, considering 1 stave = 1 chip. TODO: add the final segmentation in chips
     numberOfChipsTotal += mNumberOfChipsPerLayerMLOT[i];
     mLastChipIndex[i + mNumberOfPetalsVD] = numberOfChipsTotal - 1;
     mLastChipIndexMLOT[i] = numberOfChipsTotal - 1;
   }
 
-  setSize(mNumberOfLayersMLOT + mNumberOfActivePartsVD); /// temporary, number of chips = number of layers and active parts
+  // setSize(mNumberOfLayersMLOT + mNumberOfActivePartsVD); /// temporary, number of chips = number of layers and active parts
+  setSize(numberOfChipsTotal); /// temporary, number of chips = number of staves and active parts
   fillMatrixCache(loadTrans);
 }
 
@@ -143,14 +144,35 @@ int GeometryTGeo::getLayer(int index) const
 {
   int subDetID = getSubDetID(index);
   int petalcase = getPetalCase(index);
+  int lay = 0;
 
   if (subDetID == 0) { /// VD
     if (index % mNumberOfChipsPerPetalVD[petalcase] >= mNumberOfLayersVD) {
       return -1; /// disks
     }
-    return index % mNumberOfChipsPerPetalVD[petalcase];
+    lay = index % mNumberOfChipsPerPetalVD[petalcase];
+    // return index % mNumberOfChipsPerPetalVD[petalcase];
   } else if (subDetID == 1) { /// MLOT
-    return index % (mNumberOfLayersVD + mNumberOfLayersMLOT);
+    while (index > mLastChipIndex[lay]) {
+      lay++;
+    }
+    return lay - mNumberOfPetalsVD; /// numeration of MLOT layesrs  starting from 1
+  }
+  return -1; /// -1 if not found
+}
+//__________________________________________________________________________
+int GeometryTGeo::getStave(int index) const
+{
+  int subDetID = getSubDetID(index);
+  int lay = getLayer(index);
+  int petalcase = getPetalCase(index);
+
+  if (subDetID == 0) { /// VD
+    return -1;
+  } else if (subDetID == 1) { /// MLOT
+    int lay = getLayer(index);
+    index -= getFirstChipIndex(lay, petalcase, subDetID);
+    return index; /// ||||
   }
   return -1; /// not found
 }
@@ -176,21 +198,20 @@ TString GeometryTGeo::getMatrixPath(int index) const
 {
 
   // int lay, hba, stav, sstav, mod, chipInMod;
-  int petalcase, disk, lay, subDetID; /// TODO: add staves in a second step
+  int subDetID, petalcase, disk, lay, stave; /// TODO: add chips in a second step
   subDetID = getSubDetID(index);
   petalcase = getPetalCase(index);
   lay = getLayer(index);
   disk = getDisk(index);
+  stave = getStave(index);
 
-  std::cout << "\nindex = " << index << std::endl;
+  // std::cout << "\nindex = " << index << std::endl;
   // std::cout << "subDetID = " << subDetID << std::endl;
   // std::cout << "petalcase = " << petalcase << std::endl;
   // std::cout << "layer = " << lay << std::endl;
   // std::cout << "disk = " << disk << std::endl;
-
-  // lay = getLayer(index); /// questo non va bene credo perchè è troppo generale, farlo che deve andare dopo il dìsubDetID
-
-  // int wrID = mLayerToWrapper[lay];
+  // std::cout << "first chip index = " << getFirstChipIndex(lay, petalcase, subDetID) << std::endl;
+  // std::cout << "stave = " << stave << std::endl;
 
   // TString path = Form("/cave_1/barrel_1/%s_2/", GeometryTGeo::getTRKVolPattern());
   TString path = "/cave_1/barrel_1/TRKV_2/TRKLayer0_1/TRKStave0_1/TRKChip0_1/TRKSensor0_1/"; /// dummy path, to be replaced
@@ -301,7 +322,7 @@ void GeometryTGeo::fillMatrixCache(int mask)
     auto& cacheL2G = getCacheL2G();
     cacheL2G.setSize(mSize);
 
-    for (int i = 0; i < mSize; i++) { /// here get the matrices for det ID between 0 and 43 (mSize = 44 at the moment)
+    for (int i = 0; i < mSize; i++) { /// here get the matrices for det ID between 0 and 257 (mSize = 258 at the moment)
       TGeoHMatrix* hm = extractMatrixSensor(i);
       cacheL2G.setMatrix(Mat3D(*hm), i);
     }
@@ -424,7 +445,7 @@ int GeometryTGeo::extractNumberOfActivePartsVD() const
 //__________________________________________________________________________
 int GeometryTGeo::extractNumberOfDisksVD() const
 {
-  // The number of active parts returned here is 6
+  // The number of disks returned here is 6
   int numberOfDisks = 0;
 
   TGeoVolume* vdV = gGeoManager->GetVolume(getTRKVolPattern());
@@ -555,8 +576,8 @@ int GeometryTGeo::extractNumberOfStavesMLOT(int lay) const
 
   // Loop on all layV nodes, count Layer volumes by checking names
   TObjArray* nodes = layV->GetNodes();
-  std::cout << "Printing nodes for layer " << lay << std::endl;
-  nodes->Print();
+  // std::cout << "Printing nodes for layer " << lay << std::endl;
+  // nodes->Print();
   int nNodes = nodes->GetEntriesFast();
 
   for (int j = 0; j < nNodes; j++) {