ITS3: template detector coord conversion on input type

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

Author: f3sch

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

@@ -151,7 +151,8 @@ class SegmentationMosaix
   }
 
   // Same as localToDetector w.o. checks.
-  constexpr void localToDetectorUnchecked(float const xRow, float const zCol, int& iRow, int& iCol) const noexcept
+  template <typename T = float>
+  constexpr void localToDetectorUnchecked(T const xRow, T const zCol, int& iRow, int& iCol) const noexcept
   {
     iRow = static_cast<int>(std::floor((WidthH - xRow) / PitchRow));
     iCol = static_cast<int>(std::floor((zCol + LengthH) / PitchCol));
@@ -167,7 +168,8 @@ class SegmentationMosaix
   /// 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(float const row, float const col, float& xRow, float& zCol) const noexcept
+  template <typename T = float, typename L = float>
+  bool detectorToLocal(T const row, T const col, L& xRow, L& zCol) const noexcept
   {
     if (!isValidDet(row, col)) {
       return false;
@@ -178,25 +180,28 @@ class SegmentationMosaix
 
   // Same as detectorToLocal w.o. checks.
   // We position ourself in the middle of the pixel.
-  void detectorToLocalUnchecked(float const row, float const col, float& xRow, float& zCol) const noexcept
+  template <typename T = float, typename L = float>
+  void detectorToLocalUnchecked(T const row, T const col, L& xRow, L& zCol) const noexcept
   {
     xRow = -(row + 0.5f) * PitchRow + WidthH;
     zCol = (col + 0.5f) * PitchCol - LengthH;
   }
 
-  bool detectorToLocal(float const row, float const col, math_utils::Point3D<float>& loc) const noexcept
+  template <typename T = float, typename L = float>
+  bool detectorToLocal(T const row, T const col, math_utils::Point3D<L>& loc) const noexcept
   {
-    float xRow{0.}, zCol{0.};
+    L xRow{0.}, zCol{0.};
     if (!detectorToLocal(row, col, xRow, zCol)) {
       return false;
     }
     loc.SetCoordinates(xRow, 0.0f, zCol);
     return true;
   }
 
-  void detectorToLocalUnchecked(float const row, float const col, math_utils::Point3D<float>& loc) const noexcept
+  template <typename T = float, typename L = float>
+  void detectorToLocalUnchecked(T const row, T const col, math_utils::Point3D<L>& loc) const noexcept
   {
-    float xRow{0.}, zCol{0.};
+    L xRow{0.}, zCol{0.};
     detectorToLocalUnchecked(row, col, xRow, zCol);
     loc.SetCoordinates(xRow, 0.0f, zCol);
   }

Detectors/Upgrades/ITS3/reconstruction/include/ITS3Reconstruction/IOUtils.h

@@ -27,7 +27,7 @@ constexpr float DefClusError2Row = DefClusErrorRow * DefClusErrorRow;
 constexpr float DefClusError2Col = DefClusErrorCol * DefClusErrorCol;
 
 template <class iterator, typename T = float>
-o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, iterator& iter, const its3::TopologyDictionary* dict, T& sig2y, T& sig2z)
+o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, iterator& iter, const o2::its3::TopologyDictionary* dict, T& sig2y, T& sig2z)
 {
   auto pattID = c.getPatternID();
   auto ib = constants::detID::isDetITS3(c.getSensorID());
@@ -50,7 +50,7 @@ o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, i
 }
 
 template <class iterator, typename T = float>
-o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, iterator& iter, const its3::TopologyDictionary* dict, T& sig2y, T& sig2z, uint8_t& cls)
+o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, iterator& iter, const o2::its3::TopologyDictionary* dict, T& sig2y, T& sig2z, uint8_t& cls)
 {
   auto pattID = c.getPatternID();
   auto ib = constants::detID::isDetITS3(c.getSensorID());
@@ -69,13 +69,13 @@ o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, i
 void convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clusters,
                             gsl::span<const unsigned char>::iterator& pattIt,
                             std::vector<o2::BaseCluster<float>>& output,
-                            const its3::TopologyDictionary* dict);
+                            const o2::its3::TopologyDictionary* dict);
 
 int loadROFrameDataITS3(its::TimeFrame<7>* tf,
                         gsl::span<const o2::itsmft::ROFRecord> rofs,
                         gsl::span<const itsmft::CompClusterExt> clusters,
                         gsl::span<const unsigned char>::iterator& pattIt,
-                        const its3::TopologyDictionary* dict,
+                        const o2::its3::TopologyDictionary* dict,
                         const dataformats::MCTruthContainer<MCCompLabel>* mcLabels = nullptr);
 
 } // namespace o2::its3::ioutils

Detectors/Upgrades/ITS3/reconstruction/src/TopologyDictionary.cxx

@@ -255,5 +255,7 @@ TopologyDictionary* TopologyDictionary::loadFrom(const std::string& fname, const
 // Explicitly instaniate templates
 template math_utils::Point3D<float> TopologyDictionary::getClusterCoordinates<float>(const itsmft::CompClusterExt& cl) const;
 template math_utils::Point3D<float> TopologyDictionary::getClusterCoordinates<float>(const itsmft::CompClusterExt& cl, const itsmft::ClusterPattern& patt, bool isGroup);
+template math_utils::Point3D<double> TopologyDictionary::getClusterCoordinates<double>(const itsmft::CompClusterExt& cl) const;
+template math_utils::Point3D<double> TopologyDictionary::getClusterCoordinates<double>(const itsmft::CompClusterExt& cl, const itsmft::ClusterPattern& patt, bool isGroup);
 
 } // namespace o2::its3