ITS3: minor changes in Digitizer for float

Signed-off-by: Felix Schlepper <[email protected]>

Author: f3sch

Detectors/Upgrades/ITS3/simulation/include/ITS3Simulation/Digitizer.h

@@ -106,14 +106,14 @@ class Digitizer : public TObject
   uint32_t mEventROFrameMin = 0xffffffff; ///< lowest RO frame for processed events (w/o automatic noise ROFs)
   uint32_t mEventROFrameMax = 0;          ///< highest RO frame forfor processed events (w/o automatic noise ROFs)
 
-  const std::array<o2::its3::SegmentationMosaix, 3> mIBSegmentations{0, 1, 2};
+  static constexpr std::array<o2::its3::SegmentationMosaix, 3> mIBSegmentations{0, 1, 2};
 
   o2::itsmft::AlpideSimResponse* mSimRespIB = nullptr; // simulated response for IB
   o2::itsmft::AlpideSimResponse* mSimRespOB = nullptr; // simulated response for OB
-  float mSimRespIBShift{0.};                           // adjusting the Y-shift in the IB response function to match sensor local coord.
-  float mSimRespIBScaleX{1.};                          // scale x-local coordinate to response function x-coordinate
-  float mSimRespIBScaleZ{1.};                          // scale z-local coordinate to response function z-coordinate
-  float mSimRespOBShift{0.};                           // adjusting the Y-shift in the OB response function to match sensor local coord.
+  float mSimRespIBShift{0.f};                          // adjusting the Y-shift in the IB response function to match sensor local coord.
+  float mSimRespIBScaleX{1.f};                         // scale x-local coordinate to response function x-coordinate
+  float mSimRespIBScaleZ{1.f};                         // scale z-local coordinate to response function z-coordinate
+  float mSimRespOBShift{0.f};                          // adjusting the Y-shift in the OB response function to match sensor local coord.
 
   const o2::its::GeometryTGeo* mGeometry = nullptr; ///< ITS3 geometry
 

Detectors/Upgrades/ITS3/simulation/src/Digitizer.cxx

@@ -65,13 +65,13 @@ void Digitizer::init()
     if (const auto& func = ITS3Params::Instance().chipResponseFunction; func == "Alpide") {
       constexpr const char* responseFile = "$(O2_ROOT)/share/Detectors/ITSMFT/data/AlpideResponseData/AlpideResponseData.root";
       loadSetResponseFunc("Alpide", responseFile, "response0", responseFile, "response1");
-      mSimRespIBShift = mSimRespIB->getDepthMax() - SegmentationMosaix::SensorLayerThickness / 2.f + 10.e-4f; // TODO why this offset?
+      mSimRespIBShift = mSimRespIB->getDepthMax() - SegmentationMosaix::SensorLayerThickness / 2.f + 10.e-4f;
       mSimRespOBShift = mSimRespOB->getDepthMax() - SegmentationAlpide::SensorLayerThickness / 2.f;
     } else if (func == "APTS") {
       constexpr const char* responseFileIB = "$(O2_ROOT)/share/Detectors/Upgrades/ITS3/data/ITS3ChipResponseData/APTSResponseData.root";
       constexpr const char* responseFileOB = "$(O2_ROOT)/share/Detectors/ITSMFT/data/AlpideResponseData/AlpideResponseData.root";
       loadSetResponseFunc("APTS", responseFileIB, "response1", responseFileOB, "response1");
-      mSimRespIBShift = mSimRespIB->getDepthMax() - 10.e-4f;
+      mSimRespIBShift = mSimRespIB->getDepthMax() - 6.5e-4f;
       mSimRespOBShift = mSimRespOB->getDepthMax() - SegmentationAlpide::SensorLayerThickness / 2.f;
       mSimRespIBScaleX = 0.5 * constants::pixelarray::pixels::apts::pitchX / SegmentationMosaix::PitchRow;
       mSimRespIBScaleZ = 0.5 * constants::pixelarray::pixels::apts::pitchZ / SegmentationMosaix::PitchCol;
@@ -328,15 +328,13 @@ void Digitizer::processHit(const o2::itsmft::Hit& hit, uint32_t& maxFr, int evID
 
   const int maxNrows{innerBarrel ? SegmentationMosaix::NRows : SegmentationAlpide::NRows};
   const int maxNcols{innerBarrel ? SegmentationMosaix::NCols : SegmentationAlpide::NCols};
-  if (rowE >= maxNrows) {
-    rowE = maxNrows - 1;
-  }
+
+  rowE = std::min(rowE, maxNrows - 1);
   colS -= AlpideRespSimMat::NPix / 2;
   colE += AlpideRespSimMat::NPix / 2;
   colS = std::max(colS, 0);
-  if (colE >= maxNcols) {
-    colE = maxNcols - 1;
-  }
+  colE = std::min(colE, maxNcols - 1);
+
   int rowSpan = rowE - rowS + 1, colSpan = colE - colS + 1; // size of plaquet where some response is expected
   float respMatrix[rowSpan][colSpan];                       // response accumulated here
   std::fill(&respMatrix[0][0], &respMatrix[0][0] + rowSpan * colSpan, 0.f);
@@ -379,12 +377,12 @@ void Digitizer::processHit(const o2::itsmft::Hit& hit, uint32_t& maxFr, int evID
     float rowMax{}, colMax{};
     const AlpideRespSimMat* rspmat{nullptr};
     if (innerBarrel) {
-      rowMax = 0.5 * SegmentationMosaix::PitchRow;
-      colMax = 0.5 * SegmentationMosaix::PitchCol;
+      rowMax = 0.5f * SegmentationMosaix::PitchRow;
+      colMax = 0.5f * SegmentationMosaix::PitchCol;
       rspmat = mSimRespIB->getResponse(mSimRespIBScaleX * (xyzLocS.X() - cRowPix), mSimRespIBScaleZ * (xyzLocS.Z() - cColPix), xyzLocS.Y(), flipRow, flipCol, rowMax, colMax);
     } else {
-      rowMax = 0.5 * SegmentationAlpide::PitchRow;
-      colMax = 0.5 * SegmentationAlpide::PitchCol;
+      rowMax = 0.5f * SegmentationAlpide::PitchRow;
+      colMax = 0.5f * SegmentationAlpide::PitchCol;
       rspmat = mSimRespOB->getResponse(xyzLocS.X() - cRowPix, xyzLocS.Z() - cColPix, xyzLocS.Y(), flipRow, flipCol, rowMax, colMax);
     }