Fixed number of half barrels

Author: Mario Sitta

Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h

@@ -108,7 +108,7 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
   int getNumberOfModules(int lay) const { return mNumberOfModules[lay]; }
   int getNumberOfHalfStaves(int lay) const { return mNumberOfHalfStaves[lay]; }
   int getNumberOfStaves(int lay) const { return mNumberOfStaves[lay]; }
-  int getNumberOfHalfBarrels(int lay) const { return mNumberOfHalfBarrels[lay]; }
+  int getNumberOfHalfBarrels() const { return mNumberOfHalfBarrels; }
   int getNumberOfLayers() const { return mNumberOfLayers; }
   int getChipIndex(int lay, int detInLay) const { return getFirstChipIndex(lay) + detInLay; }
   /// This routine computes the chip index number from the layer, stave, and chip number in stave
@@ -313,7 +313,7 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
 
   /// Determines the number of halfbarrels in the layer
   /// \param lay: layer number, starting from 0
-  int extractNumberOfHalfBarrels(int lay) const;
+  int extractNumberOfHalfBarrels() const;
 
   /// Determines the number of layers in the Geometry
   /// \param lay: layer number, starting from 0
@@ -351,7 +351,7 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
   static constexpr int MAXLAYERS = 15; ///< max number of active layers
 
   Int_t mNumberOfLayers;                        ///< number of layers
-  std::vector<int> mNumberOfHalfBarrels;        ///< the number of halfbarrels/layer(layer)
+  Int_t mNumberOfHalfBarrels;                   ///< number of halfbarrels
   std::vector<int> mNumberOfStaves;             ///< number of staves/layer(layer)
   std::vector<int> mNumberOfHalfStaves;         ///< the number of substaves/stave(layer)
   std::vector<int> mNumberOfModules;            ///< number of modules/substave(layer)

Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx

@@ -260,7 +260,7 @@ bool GeometryTGeo::getChipId(int index, int& lay, int& hba, int& sta, int& hsta,
 {
   lay = getLayer(index);
   index -= getFirstChipIndex(lay);
-  hba = mNumberOfHalfBarrels[lay] > 0 ? index / mNumberOfChipsPerHalfBarrel[lay] : -1;
+  hba = mNumberOfHalfBarrels > 0 ? index / mNumberOfChipsPerHalfBarrel[lay] : -1;
   index %= mNumberOfChipsPerHalfBarrel[lay];
   sta = index / mNumberOfChipsPerStave[lay];
   index %= mNumberOfChipsPerStave[lay];
@@ -335,7 +335,7 @@ TGeoHMatrix* GeometryTGeo::extractMatrixSensor(int index) const
   path +=
     Form("%s%d_1/", GeometryTGeo::getITSLayerPattern(), lay);
 
-  if (mNumberOfHalfBarrels[lay] > 0) {
+  if (mNumberOfHalfBarrels > 0) {
     path += Form("%s%d_%d/", GeometryTGeo::getITSHalfBarrelPattern(), lay, hba);
   }
   path +=
@@ -393,7 +393,6 @@ void GeometryTGeo::Build(int loadTrans)
   }
 
   mNumberOfStaves.resize(mNumberOfLayers);
-  mNumberOfHalfBarrels.resize(mNumberOfLayers);
   mNumberOfHalfStaves.resize(mNumberOfLayers);
   mNumberOfModules.resize(mNumberOfLayers);
   mNumberOfChipsPerModule.resize(mNumberOfLayers);
@@ -405,16 +404,16 @@ void GeometryTGeo::Build(int loadTrans)
   mLastChipIndex.resize(mNumberOfLayers);
   int numberOfChips = 0;
 
+  mNumberOfHalfBarrels = extractNumberOfHalfBarrels();
   for (int i = 0; i < mNumberOfLayers; i++) {
-    mNumberOfHalfBarrels[i] = extractNumberOfHalfBarrels(i);
     mNumberOfStaves[i] = extractNumberOfStaves(i);
     mNumberOfHalfStaves[i] = extractNumberOfHalfStaves(i);
     mNumberOfModules[i] = extractNumberOfModules(i);
     mNumberOfChipsPerModule[i] = extractNumberOfChipsPerModule(i, mNumberOfChipRowsPerModule[i]);
     mNumberOfChipsPerHalfStave[i] = mNumberOfChipsPerModule[i] * Max(1, mNumberOfModules[i]);
     mNumberOfChipsPerStave[i] = mNumberOfChipsPerHalfStave[i] * Max(1, mNumberOfHalfStaves[i]);
     mNumberOfChipsPerLayer[i] = mNumberOfChipsPerStave[i] * mNumberOfStaves[i];
-    mNumberOfChipsPerHalfBarrel[i] = mNumberOfChipsPerLayer[i] / Max(1, mNumberOfHalfBarrels[i]);
+    mNumberOfChipsPerHalfBarrel[i] = mNumberOfChipsPerLayer[i] / Max(1, mNumberOfHalfBarrels);
     numberOfChips += mNumberOfChipsPerLayer[i];
     mLastChipIndex[i] = numberOfChips - 1;
   }
@@ -553,27 +552,11 @@ int GeometryTGeo::extractNumberOfLayers()
 }
 
 //__________________________________________________________________________
-int GeometryTGeo::extractNumberOfHalfBarrels(int lay) const
+int GeometryTGeo::extractNumberOfHalfBarrels() const
 {
-  int numberOfHalfBarrels = 0;
-  char laynam[30];
-  snprintf(laynam, 30, "%s%d", getITSLayerPattern(), lay);
-  TGeoVolume* volLr = gGeoManager->GetVolume(laynam);
-  if (!volLr) {
-    LOG(FATAL) << "can't find " << laynam << " volume";
-    return -1;
-  }
+  // We take in account that we always have 2 and only 2 half barrels
+  int numberOfHalfBarrels = 2;
 
-  // Loop on all layer nodes, count HalfBarrel volumes by checking names
-  int nNodes = volLr->GetNodes()->GetEntries();
-  for (int j = 0; j < nNodes; j++) {
-    // LOG(INFO) << "L" << lay << " " << j << " of " << nNodes << " "
-    //           << volLr->GetNodes()->At(j)->GetName() << " "
-    //           << getITSHalfBarrelPattern() << " -> " << numberOfHalfBarrels;
-    if (strstr(volLr->GetNodes()->At(j)->GetName(), getITSHalfBarrelPattern())) {
-      numberOfHalfBarrels++;
-    }
-  }
   return numberOfHalfBarrels;
 }
 
@@ -582,7 +565,7 @@ int GeometryTGeo::extractNumberOfStaves(int lay) const
 {
   int numberOfStaves = 0;
   char hbarnam[30];
-  if (mNumberOfHalfBarrels[lay] == 0) {
+  if (mNumberOfHalfBarrels == 0) {
     snprintf(hbarnam, 30, "%s%d", getITSLayerPattern(), lay);
   } else {
     snprintf(hbarnam, 30, "%s%d", getITSHalfBarrelPattern(), lay);
@@ -603,7 +586,7 @@ int GeometryTGeo::extractNumberOfStaves(int lay) const
       numberOfStaves++;
     }
   }
-  return mNumberOfHalfBarrels[lay] > 0 ? (numberOfStaves * mNumberOfHalfBarrels[lay]) : numberOfStaves;
+  return mNumberOfHalfBarrels > 0 ? (numberOfStaves * mNumberOfHalfBarrels) : numberOfStaves;
 }
 
 //__________________________________________________________________________

Detectors/ITSMFT/ITS/macros/test/ITSMisaligner.C

@@ -45,7 +45,7 @@ void ITSMisaligner(const std::string& ccdbHost = "http://ccdb-test.cern.ch:8080"
     pars = generateMisalignment(xLay, yLay, zLay, psiLay, thetaLay, phiLay);
     params.emplace_back(symname.c_str(), -1, pars[0], pars[1], pars[2], pars[3], pars[4], pars[5], glo);
 
-    for (int ihb = 0; ihb < geom->getNumberOfHalfBarrels(ilr); ihb++) {
+    for (int ihb = 0; ihb < geom->getNumberOfHalfBarrels(); ihb++) {
       symname = geom->composeSymNameHalfBarrel(ilr, ihb);
       pars = generateMisalignment(xSta, ySta, zSta, psiSta, thetaSta, phiSta);
       params.emplace_back(symname.c_str(), -1, pars[0], pars[1], pars[2], pars[3], pars[4], pars[5], glo);