ITS3: scale pixel-resp + fix OB resp func

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

Detectors/Upgrades/ITS3/base/include/ITS3Base/SpecsV2.h

@@ -35,6 +35,27 @@ constexpr int nRows{442};
 constexpr int nPixels{nRows * nCols};
 constexpr EColor color{kGreen};
 constexpr double area{width * length};
+namespace pixels
+{
+namespace apts
+{
+constexpr double pitchX{15.0 * mu};
+constexpr double pitchZ{15.0 * mu};
+} // namespace apts
+namespace moss
+{
+namespace top
+{
+constexpr double pitchX{22.5 * mu};
+constexpr double pitchZ{22.5 * mu};
+} // namespace top
+namespace bot
+{
+constexpr double pitchX{18.0 * mu};
+constexpr double pitchZ{18.0 * mu};
+} // namespace bot
+} // namespace moss
+} // namespace pixels
 } // namespace pixelarray
 namespace tile
 {

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

@@ -111,6 +111,8 @@ class Digitizer : public TObject
   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.
 
   const o2::its::GeometryTGeo* mGeometry = nullptr; ///< ITS3 geometry

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

@@ -48,11 +48,11 @@ void Digitizer::init()
     auto loadSetResponseFunc = [&](const char* name, const char* fileIB, const char* nameIB, const char* fileOB, const char* nameOB) {
       LOGP(info, "Loading response function for {}: IB={}:{} ; OB={}:{}", name, nameIB, fileIB, nameOB, fileOB);
       auto fIB = TFile::Open(fileIB, "READ");
-      if (fIB->IsZombie() || !fIB->IsOpen()) {
+      if (!fIB || fIB->IsZombie() || !fIB->IsOpen()) {
         LOGP(fatal, "Cannot open file {}", fileIB);
       }
-      auto fOB = TFile::Open(fileIB, "READ");
-      if (fOB->IsZombie() || !fOB->IsOpen()) {
+      auto fOB = TFile::Open(fileOB, "READ");
+      if (!fOB || fOB->IsZombie() || !fOB->IsOpen()) {
         LOGP(fatal, "Cannot open file {}", fileOB);
       }
       mParams.setIBSimResponse(mSimRespIB = fIB->Get<o2::itsmft::AlpideSimResponse>(nameIB));
@@ -72,11 +72,15 @@ void Digitizer::init()
       loadSetResponseFunc("APTS", responseFileIB, "response1", responseFileOB, "response1");
       mSimRespIBShift = mSimRespIB->getDepthMax() - 10.e-4f;
       mSimRespOBShift = mSimRespOB->getDepthMax() - Segmentation::SensorLayerThickness / 2.f;
+      mSimRespIBScaleX = 0.5 * constants::pixelarray::pixels::apts::pitchX / SegmentationMosaix::mPitchRow;
+      mSimRespIBScaleZ = 0.5 * constants::pixelarray::pixels::apts::pitchZ / SegmentationMosaix::mPitchCol;
     } else {
       LOGP(fatal, "ResponseFunction '{}' not implemented!", func);
     }
   }
   mParams.print();
+  LOGP(info, "IBShift = {} ; OBShift = {}", mSimRespIBShift, mSimRespOBShift);
+  LOGP(info, "IB-Scale: X={} ; Z={}", mSimRespIBScaleX, mSimRespIBScaleZ);
   mIRFirstSampledTF = o2::raw::HBFUtils::Instance().getFirstSampledTFIR();
 }
 
@@ -375,9 +379,17 @@ void Digitizer::processHit(const o2::itsmft::Hit& hit, uint32_t& maxFr, int evID
     }
     bool flipCol = false, flipRow = false;
     // note that response needs coordinates along column row (locX) (locZ) then depth (locY)
-    float rowMax{0.5f * (innerBarrel ? SegmentationMosaix::mPitchRow : Segmentation::PitchRow)};
-    float colMax{0.5f * (innerBarrel ? SegmentationMosaix::mPitchCol : Segmentation::PitchCol)};
-    auto rspmat = ((innerBarrel) ? mSimRespIB : mSimRespOB)->getResponse(xyzLocS.X() - cRowPix, xyzLocS.Z() - cColPix, xyzLocS.Y(), flipRow, flipCol, rowMax, colMax);
+    float rowMax{}, colMax{};
+    const AlpideRespSimMat* rspmat{nullptr};
+    if (innerBarrel) {
+      rowMax = 0.5 * SegmentationMosaix::mPitchRow;
+      colMax = 0.5 * SegmentationMosaix::mPitchCol;
+      rspmat = mSimRespIB->getResponse(mSimRespIBScaleX * (xyzLocS.X() - cRowPix), mSimRespIBScaleZ * (xyzLocS.Z() - cColPix), xyzLocS.Y(), flipRow, flipCol, rowMax, colMax);
+    } else {
+      rowMax = 0.5 * Segmentation::PitchRow;
+      colMax = 0.5 * Segmentation::PitchCol;
+      rspmat = mSimRespOB->getResponse(xyzLocS.X() - cRowPix, xyzLocS.Z() - cColPix, xyzLocS.Y(), flipRow, flipCol, rowMax, colMax);
+    }
 
     xyzLocS += step;
     if (rspmat == nullptr) {