Merge branch 'dev' into trd-dcs-sw

Author: leo-barreto

.github/workflows/async-auto-label.yml

@@ -0,0 +1,17 @@
+---
+name: Apply requested async label
+
+'on':
+  issue_comment:
+    types:
+      - created
+      - edited
+
+permissions: {}
+
+jobs:
+  apply_async_labels:
+    name: Apply requested async label
+    uses: alisw/ali-bot/.github/workflows/async-auto-label.yml@master
+    permissions:
+      pull-requests: write   # to update labels

.github/workflows/async-list-label.yml

@@ -0,0 +1,19 @@
+---
+name: Collect and print async labels
+
+'on':
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+    branches:
+      - dev
+
+permissions: {}
+
+jobs:
+  list_async_labels:
+    name: Collect and print async labels
+    uses: alisw/ali-bot/.github/workflows/async-list-label.yml@master
+    permissions:
+      pull-requests: write   # to update labels

Common/MathUtils/include/MathUtils/detail/basicMath.h

@@ -65,7 +65,7 @@ GPUhdi() T abs(T x)
 template <class T>
 GPUdi() int nint(T x)
 {
-  return o2::gpu::GPUCommonMath::Nint(x);
+  return o2::gpu::GPUCommonMath::Float2IntRn(x);
 };
 
 template <class T>

DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/ROFRecord.h

@@ -58,7 +58,6 @@ class ROFRecord
     mROFEntry.clear();
     mBCData.clear();
   }
-  void print() const;
 
   template <typename T>
   gsl::span<const T> getROFData(const gsl::span<const T> tfdata) const
@@ -84,6 +83,10 @@ class ROFRecord
     return i < getNEntries() ? &tfdata[getFirstEntry() + i] : nullptr;
   }
 
+  std::string asString() const;
+  void print() const;
+  friend std::ostream& operator<<(std::ostream& output, const ROFRecord& rec);
+
  private:
   o2::InteractionRecord mBCData; // BC data for given trigger
   EvIdx mROFEntry;               //< reference on the 1st object of the ROF in data
@@ -105,7 +108,10 @@ struct MC2ROFRecord {
   MC2ROFRecord() = default;
   MC2ROFRecord(int evID, int rofRecID, ROFtype mnrof, ROFtype mxrof) : eventRecordID(evID), rofRecordID(rofRecID), minROF(mnrof), maxROF(mxrof) {}
   int getNROFs() const { return (rofRecordID < 0 || minROF > maxROF) ? 0 : (maxROF - minROF); }
+  std::string asString() const;
   void print() const;
+  friend std::ostream& operator<<(std::ostream& output, const MC2ROFRecord& rec);
+
   ClassDefNV(MC2ROFRecord, 1);
 };
 } // namespace itsmft

DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TopologyDictionary.h

@@ -54,8 +54,8 @@ struct GroupStruct {
   float mErrZ;             ///< Error associated to the hit point in the z direction.
   float mErr2X;            ///< Squared Error associated to the hit point in the x direction.
   float mErr2Z;            ///< Squared Error associated to the hit point in the z direction.
-  float mXCOG;             ///< x position of te COG wrt the boottom left corner of the bounding box
-  float mZCOG;             ///< z position of te COG wrt the boottom left corner of the bounding box
+  float mXCOG;             ///< x position of the COG wrt the bottom left corner of the bounding box
+  float mZCOG;             ///< z position of the COG wrt the bottom left corner of the bounding box
   int mNpixels;            ///< Number of fired pixels
   ClusterPattern mPattern; ///< Bitmask of pixels. For groups the biggest bounding box for the group is taken, with all
                            /// the bits set to 1.

DataFormats/Detectors/ITSMFT/common/src/ROFRecord.cxx

@@ -11,18 +11,38 @@
 
 #include "DataFormatsITSMFT/ROFRecord.h"
 #include <iostream>
+#include "fmt/format.h"
 
 using namespace o2::itsmft;
 
+std::string ROFRecord::asString() const
+{
+  return fmt::format("ROF: {} | {} entries starting from {}", mROFrame, getNEntries(), getFirstEntry());
+}
+
 void ROFRecord::print() const
 {
-  std::cout << "ROF: " << mROFrame << " | " << getNEntries() << " entries starting from "
-            << getFirstEntry() << std::endl;
-  mBCData.print();
+  std::cout << this << "\n\t" << mBCData << std::endl;
+}
+
+std::ostream& operator<<(std::ostream& stream, ROFRecord const& rec)
+{
+  stream << rec.asString();
+  return stream;
+}
+
+std::string MC2ROFRecord::asString() const
+{
+  return fmt::format("MCEventID: {} ROFs: {}-{} Entry in ROFRecords: {}", eventRecordID, minROF, maxROF, rofRecordID);
 }
 
 void MC2ROFRecord::print() const
 {
-  std::cout << "MCEventID: " << eventRecordID << " ROFs: " << minROF << '-' << maxROF
-            << " Entry in ROFRecords: " << rofRecordID << std::endl;
+  std::cout << this << std::endl;
+}
+
+std::ostream& operator<<(std::ostream& stream, MC2ROFRecord const& rec)
+{
+  stream << rec.asString();
+  return stream;
 }

DataFormats/Detectors/TRD/include/DataFormatsTRD/Tracklet64.h

@@ -142,7 +142,7 @@ class Tracklet64
 
   // pad column number inside pad row as int can be off by +-1 pad (same function name as for TRD digit)
   // FIXME: understand why the offset seems to be 8 pads and not nChannels / 2 = 10.5
-  GPUd() int getPadCol() const { return GPUCA_NAMESPACE::gpu::CAMath::Nint(getPadColFloat() - 2); }
+  GPUd() int getPadCol() const { return GPUCA_NAMESPACE::gpu::CAMath::Float2IntRn(getPadColFloat() - 2); }
 
   // translate local position into global y (in cm) not taking into account calibrations (ExB, vDrift, t0)
   GPUd() float getUncalibratedY() const

Detectors/Align/src/AlignableDetectorTPC.cxx

@@ -214,7 +214,7 @@ int AlignableDetectorTPC::processPoints(GIndex gid, int npntCut, bool inv)
 
     gpu::gpustd::array<float, 2> p = {y, z};
     gpu::gpustd::array<float, 3> c = {0, 0, 0};
-    mController->getTPCParam()->GetClusterErrors2(currentRow, z, trkParam.getSnp(), trkParam.getTgl(), c[0], c[2]);
+    mController->getTPCParam()->GetClusterErrors2(sector, currentRow, z, trkParam.getSnp(), trkParam.getTgl(), -1.f, 0.f, c[0], c[2]); // TODO: Note this disables occupancy / charge components of the error estimation
     if (sysE[0] > 0.f) {
       c[0] += sysE[0] * sysE[0];
     }

Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h

@@ -342,7 +342,8 @@ class MatchTPCITS
            pmr::vector<o2::MCCompLabel>& ABTrackletLabels,
            pmr::vector<o2::dataformats::Triplet<float, float, float>>& calib);
   void refitWinners(pmr::vector<o2::dataformats::TrackTPCITS>& matchedTracks, pmr::vector<o2::MCCompLabel>& matchLabels, pmr::vector<o2::dataformats::Triplet<float, float, float>>& calib);
-  bool refitTrackTPCITS(int iTPC, int& iITS, pmr::vector<o2::dataformats::TrackTPCITS>& matchedTracks, pmr::vector<o2::MCCompLabel>& matchLabels, pmr::vector<o2::dataformats::Triplet<float, float, float>>& calib);
+  bool refitTrackTPCITS(int slot, int iTPC, int& iITS, pmr::vector<o2::dataformats::TrackTPCITS>& matchedTracks, pmr::vector<o2::MCCompLabel>& matchLabels, pmr::vector<o2::dataformats::Triplet<float, float, float>>& calib);
+  void fillCalibDebug(int ifit, int iTPC, const o2::dataformats::TrackTPCITS& match, pmr::vector<o2::dataformats::Triplet<float, float, float>>& calib);
   void reportSizes(pmr::vector<o2::dataformats::TrackTPCITS>& matchedTracks,
                    pmr::vector<o2::itsmft::TrkClusRef>& ABTrackletRefs,
                    pmr::vector<int>& ABTrackletClusterIDs,
@@ -363,6 +364,7 @@ class MatchTPCITS
   ///< perform all initializations
   void init();
   void end();
+  void reportTiming();
 
   ///< clear results of previous event reco
   void clear();