ITS3: Base: Make ALPIDE pixel size configurable

v1->v2: Changed Name from Alpide to SuperAlpide to be more consistent

Signed-off-by: Felix Schlepper <f3sch.git@outlook.com>

Author: f3sch

Detectors/Upgrades/ITS3/base/CMakeLists.txt

@@ -12,8 +12,10 @@
 o2_add_library(ITS3Base
                SOURCES src/MisalignmentParameter.cxx
                        src/SegmentationSuperAlpide.cxx
+                       src/SuperAlpideParams.cxx
                PUBLIC_LINK_LIBRARIES O2::CommonConstants O2::MathUtils O2::DetectorsBase)
 
 o2_target_root_dictionary(ITS3Base
                           HEADERS include/ITS3Base/SegmentationSuperAlpide.h
-                                  include/ITS3Base/MisalignmentParameter.h)
+                                  include/ITS3Base/MisalignmentParameter.h
+                                  include/ITS3Base/SuperAlpideParams.h)

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

@@ -18,6 +18,7 @@
 #include <Rtypes.h>
 #include "MathUtils/Cartesian.h"
 #include "CommonConstants/MathConstants.h"
+#include "ITS3Base/SuperAlpideParams.h"
 #include <Framework/Logger.h>
 
 namespace o2
@@ -30,33 +31,40 @@ class SegmentationSuperAlpide
 {
  public:
   SegmentationSuperAlpide(int layer = 0) : mLayer{layer},
-                                           mNPixels{mNRows * mNCols},
+                                           mPitchCol{SuperAlpideParams::Instance().pitchCol},
+                                           mPitchRow{SuperAlpideParams::Instance().pitchRow},
+                                           mNCols{static_cast<int>(mLength / mPitchCol)},
                                            mNRows{static_cast<int>(double(mRadii[layer] + mSensorLayerThickness / 2) * double(constants::math::PI) / double(mPitchRow) + 1)},
+                                           mNPixels{mNRows * mNCols},
+                                           mActiveMatrixSizeCols{mPitchCol * mNCols},
                                            mActiveMatrixSizeRows{mPitchRow * mNRows},
+                                           mSensorSizeCols{mActiveMatrixSizeCols + mPassiveEdgeSide + mPassiveEdgeSide},
                                            mSensorSizeRows{mActiveMatrixSizeRows + mPassiveEdgeTop + mPassiveEdgeReadOut}
   {
-    LOGP(info, "rows: {} cols: {} npixels: {}", mNRows, mNCols, mNPixels);
-    LOGP(info, "SegmentationSuperAlpide: layer {} ActiveMatrixSizeRows: {} ActiveMatrixSizeCols: {}", mLayer, mActiveMatrixSizeCols, mActiveMatrixSizeRows);
+    LOGP(info, "SegmentationSuperAlpide:");
+    LOGP(info, "PitchCol={} PitchRow={}", mPitchCol, mPitchRow);
+    LOGP(info, "Layer {}: ActiveMatrixSizeRows={} ActiveMatrixSizeCols={}", mLayer, mActiveMatrixSizeCols, mActiveMatrixSizeRows);
+    LOGP(info, "Rows={} Cols={} NPixels={}", mNRows, mNCols, mNPixels);
   }
-  static constexpr std::array<float, 10> mRadii = {1.8f, 2.4f, 3.0f, 7.0f, 10.f};
-  static constexpr float mLength = 27.15f;
-  static constexpr float mPitchCol = 20.e-4;
-  static constexpr float mPitchRow = 20.e-4;
-  static constexpr int mNCols = mLength / mPitchCol;
-  int mNRows;
-  int mNPixels;
-  int mLayer;
-  static constexpr float mPassiveEdgeReadOut = 0.;                   // width of the readout edge (Passive bottom)
-  static constexpr float mPassiveEdgeTop = 0.;                       // Passive area on top
-  static constexpr float mPassiveEdgeSide = 0.;                      // width of Passive area on left/right of the sensor
-  static constexpr float mActiveMatrixSizeCols = mPitchCol * mNCols; // Active size along columns
-  float mActiveMatrixSizeRows;                                       // Active size along rows
-
-  // effective thickness of sensitive layer, accounting for charge collection non-unifoemity, https://alice.its.cern.ch/jira/browse/AOC-46
-  static constexpr float mSensorLayerThicknessEff = 28.e-4;
-  static constexpr float mSensorLayerThickness = 30.e-4;                                                // physical thickness of sensitive part
-  static constexpr float mSensorSizeCols = mActiveMatrixSizeCols + mPassiveEdgeSide + mPassiveEdgeSide; // SensorSize along columns
-  float mSensorSizeRows;                                                                                // SensorSize along rows
+  static constexpr std::array<float, 10> mRadii = {1.8f, 2.4f, 3.0f, 7.0f, 10.f}; ///< radii for different layers
+  static constexpr float mLength = 27.15f;                                        ///< chip length
+  const float mPitchCol;                                                          ///< pixel column size
+  const float mPitchRow;                                                          ///< pixel row size
+  const int mNCols;                                                               ///< number of columns
+  const int mNRows;                                                               ///< number of rows
+  const int mNPixels;                                                             ///< total number of pixels
+  const int mLayer;                                                               ///< chip layer
+  static constexpr float mPassiveEdgeReadOut = 0.;                                ///< width of the readout edge (Passive bottom)
+  static constexpr float mPassiveEdgeTop = 0.;                                    ///< Passive area on top
+  static constexpr float mPassiveEdgeSide = 0.;                                   ///< width of Passive area on left/right of the sensor
+  const float mActiveMatrixSizeCols;                                              ///< Active size along columns
+  const float mActiveMatrixSizeRows;                                              ///< Active size along rows
+
+  // effective thickness of sensitive layer, accounting for charge collection non-uniformity, https://alice.its.cern.ch/jira/browse/AOC-46
+  static constexpr float mSensorLayerThicknessEff = 28.e-4; ///< effective thickness of sensitive part
+  static constexpr float mSensorLayerThickness = 30.e-4;    ///< physical thickness of sensitive part
+  const float mSensorSizeCols;                              ///< SensorSize along columns
+  const float mSensorSizeRows;                              ///< SensorSize along rows
 
   ~SegmentationSuperAlpide() = default;
 
@@ -65,23 +73,23 @@ class SegmentationSuperAlpide
   /// \param xCurved Detector local curved coordinate x in cm with respect to
   /// the center of the sensitive volume.
   /// \param yCurved Detector local curved coordinate y in cm with respect to
-  /// the center of the sensitive volulme.
+  /// the center of the sensitive volume.
   /// \param xFlat Detector local flat coordinate x in cm with respect to
   /// the center of the sensitive volume.
   /// \param yFlat Detector local flat coordinate y in cm with respect to
-  /// the center of the sensitive volulme.
+  /// the center of the sensitive volume.
   void curvedToFlat(float xCurved, float yCurved, float& xFlat, float& yFlat);
 
   /// Transformation from the flat surface to a curved surface
   /// It works only if the detector is not rototraslated
   /// \param xFlat Detector local flat coordinate x in cm with respect to
   /// the center of the sensitive volume.
   /// \param yFlat Detector local flat coordinate y in cm with respect to
-  /// the center of the sensitive volulme.
+  /// the center of the sensitive volume.
   /// \param xCurved Detector local curved coordinate x in cm with respect to
   /// the center of the sensitive volume.
   /// \param yCurved Detector local curved coordinate y in cm with respect to
-  /// the center of the sensitive volulme.
+  /// the center of the sensitive volume.
   void flatToCurved(float xFlat, float yFlat, float& xCurved, float& yCurved);
 
   /// Transformation from Geant detector centered local coordinates (cm) to
@@ -92,7 +100,7 @@ class SegmentationSuperAlpide
   /// \param float x Detector local coordinate x in cm with respect to
   /// the center of the sensitive volume.
   /// \param float z Detector local coordinate z in cm with respect to
-  /// the center of the sensitive volulme.
+  /// the center of the sensitive volume.
   /// \param int iRow Detector x cell coordinate. Has the range 0 <= iRow < mNumberOfRows
   /// \param int iCol Detector z cell coordinate. Has the range 0 <= iCol < mNumberOfColumns
   bool localToDetector(float x, float z, int& iRow, int& iCol);
@@ -106,7 +114,7 @@ class SegmentationSuperAlpide
   /// \param float x Detector local coordinate x in cm with respect to the
   /// center of the sensitive volume.
   /// \param float z Detector local coordinate z in cm with respect to the
-  /// center of the sensitive volulme.
+  /// center of the sensitive volume.
   /// If iRow and or iCol is outside of the segmentation range a value of -0.5*Dx()
   /// or -0.5*Dz() is returned.
   bool detectorToLocal(int iRow, int iCol, float& xRow, float& zCol);
@@ -122,11 +130,14 @@ class SegmentationSuperAlpide
   {
     return 0.5 * ((mActiveMatrixSizeRows - mPassiveEdgeTop + mPassiveEdgeReadOut) - mPitchRow);
   }
-  static constexpr float getFirstColCoordinate() { return 0.5 * (mPitchCol - mActiveMatrixSizeCols); }
+  float getFirstColCoordinate()
+  {
+    return 0.5 * (mPitchCol - mActiveMatrixSizeCols);
+  }
 
   void print();
 
-  ClassDefNV(SegmentationSuperAlpide, 1); // Segmentation class upgrade pixels
+  ClassDefNV(SegmentationSuperAlpide, 2); // Segmentation class upgrade pixels
 };
 
 inline void SegmentationSuperAlpide::curvedToFlat(float xCurved, float yCurved, float& xFlat, float& yFlat)

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

@@ -0,0 +1,37 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+// \brief Collect all possible configurable parameters for Super ALPIDE chips
+
+#ifndef O2_SUPER_ALPIDE_PARAMS_H
+#define O2_SUPER_ALPIDE_PARAMS_H
+
+#include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2
+{
+namespace its3
+{
+
+/// Segmentation parameters for Super ALPIDE chips
+struct SuperAlpideParams : public o2::conf::ConfigurableParamHelper<SuperAlpideParams> {
+  float pitchCol = 20.e-4; ///< Pixel column size (cm)
+  float pitchRow = 20.e-4; ///< Pixel row size (cm)
+
+  // boilerplate
+  O2ParamDef(SuperAlpideParams, "SuperAlpideParams");
+};
+
+} // namespace its3
+} // namespace o2
+
+#endif

Detectors/Upgrades/ITS3/base/src/ITS3BaseLinkDef.h

@@ -17,5 +17,7 @@
 
 #pragma link C++ class o2::its3::SegmentationSuperAlpide + ;
 #pragma link C++ class o2::its3::MisalignmentParameter + ;
+#pragma link C++ class o2::its3::SuperAlpideParams + ;
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::its3::SuperAlpideParams> + ;
 
 #endif

Detectors/Upgrades/ITS3/base/src/SuperAlpideParams.cxx

@@ -0,0 +1,13 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#include "ITS3Base/SuperAlpideParams.h"
+O2ParamImpl(o2::its3::SuperAlpideParams);