Merge 5dafde5 into sapling-pr-archive-ktf

Author: ktf

DataFormats/Detectors/TOF/CMakeLists.txt

@@ -9,6 +9,14 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
+o2_add_library(DataFormatsParamTOF
+               SOURCES src/ParameterContainers.cxx
+               PUBLIC_LINK_LIBRARIES O2::FrameworkLogger)
+
+
+o2_target_root_dictionary(DataFormatsParamTOF
+                          HEADERS include/DataFormatsTOF/ParameterContainers.h)
+
 o2_add_library(DataFormatsTOF
                SOURCES src/Cluster.cxx
                        src/CalibInfoTOFshort.cxx
@@ -22,6 +30,7 @@ o2_add_library(DataFormatsTOF
                        src/TOFFEElightInfo.cxx
                PUBLIC_LINK_LIBRARIES O2::ReconstructionDataFormats
                                      O2::GPUCommon
+                                     O2::DataFormatsParamTOF
                                      Boost::serialization)
 
 o2_target_root_dictionary(DataFormatsTOF
@@ -33,7 +42,6 @@ o2_target_root_dictionary(DataFormatsTOF
                                   include/DataFormatsTOF/RawDataFormat.h
                                   include/DataFormatsTOF/CompressedDataFormat.h
                                   include/DataFormatsTOF/CTF.h
-                                  include/DataFormatsTOF/ParameterContainers.h
                                   include/DataFormatsTOF/CalibInfoCluster.h
                                   include/DataFormatsTOF/CosmicInfo.h
                                   include/DataFormatsTOF/TOFFEElightInfo.h

DataFormats/Detectors/TOF/include/DataFormatsTOF/Cluster.h

@@ -49,18 +49,17 @@ class Cluster : public o2::BaseCluster<float>
          kDownRight = 4, // 2^4, 5th bit
          kDown = 5,      // 2^5, 6th bit
          kDownLeft = 6,  // 2^6, 7th bit
-         kLeft = 7,      // 2^7, 8th bit
-         //
-         FrameBit = 6 }; // this bit set means that the cluster is in the nominal (alpha=20*sector+10 deg.) sector frame rather than aligned
+         kLeft = 7       // 2^7, 8th bit
+  };
 
   Cluster() = default;
 
   Cluster(std::int16_t sensid, float x, float y, float z, float sy2, float sz2, float syz, double timeRaw, double time, float tot, int L0L1latency, int deltaBC, float geanttime = 0.0, double t0 = 0.0);
 
   ~Cluster() = default;
 
-  bool isInNominalSector() const { return isBitSet(FrameBit); }
-  void setInNominalSector() { setBit(FrameBit); }
+  bool isInNominalSector() const { return mInNominalSector; }
+  void setInNominalSector(bool v = true) { mInNominalSector = v; }
 
   std::int8_t getSector() const { return getCount(); }
   void setSector(std::int8_t value) { setCount(value); }
@@ -163,9 +162,10 @@ class Cluster : public o2::BaseCluster<float>
   double mDigitInfoT[6] = {0., 0., 0., 0., 0., 0.};
   float mDigitInfoTOT[6] = {0., 0., 0., 0., 0., 0.};
   float mTgeant = 0.0;
+  bool mInNominalSector = false;
   double mT0true = 0.0;
 
-  ClassDefNV(Cluster, 5);
+  ClassDefNV(Cluster, 6);
 };
 
 #ifndef GPUCA_GPUCODE

DataFormats/Detectors/TOF/include/DataFormatsTOF/ParameterContainers.h

@@ -18,10 +18,10 @@
 #ifndef O2_TOF_PARAMCONTAINER_H
 #define O2_TOF_PARAMCONTAINER_H
 
-#include "TNamed.h"
-#include "TFile.h"
-#include "Framework/Logger.h"
-#include "map"
+#include <TNamed.h>
+#include <TFile.h>
+#include <Framework/Logger.h>
+#include <map>
 
 namespace o2
 {
@@ -37,7 +37,7 @@ class Parameters
   Parameters(std::array<std::string, nPar> parNames, std::string name) : mName{name}, mPar{}, mParNames{parNames} {};
 
   /// Default destructor
-  virtual ~Parameters() = default; // Ensure proper cleanup in derived classes
+  ~Parameters() = default;
 
   /// Setter for the parameter at position iparam
   /// \param iparam index in the array of the parameters
@@ -183,27 +183,10 @@ class ParameterCollection : public TNamed
   /// @param value parameter to add to the stored information
   /// @param pass key to look for in the stored information e.g. pass
   /// @return true if found and configured false if not fully configured
-  bool addParameter(const std::string& pass, const std::string& parName, float value)
-  {
-    const bool alreadyPresent = hasKey(pass);
-    if (alreadyPresent) {
-      LOG(debug) << "Changing parametrization corresponding to key " << pass << " from size " << mParameters[pass].size() << " to " << parName;
-    } else {
-      mParameters[pass] = std::unordered_map<std::string, paramvar_t>{};
-      LOG(debug) << "Adding new parametrization corresponding to key " << pass << ": " << parName;
-    }
-    mParameters[pass][parName] = value;
-    return true;
-  }
+  bool addParameter(const std::string& pass, const std::string& parName, float value);
 
   /// @return the size of the container i.e. the number of stored keys (or passes)
-  int getSize(const std::string& pass) const
-  {
-    if (!hasKey(pass)) {
-      return -1;
-    }
-    return mParameters.at(pass).size();
-  }
+  int getSize(const std::string& pass) const;
 
   /// @brief Function to push the parameters from the sub container into the collection and store it under a given key
   /// @tparam ParType type of the parameter container
@@ -231,26 +214,10 @@ class ParameterCollection : public TNamed
 
   /// @brief printing function for the content of the pass
   /// @param pass pass to print
-  void print(const std::string& pass) const
-  {
-    const auto& size = getSize(pass);
-    if (size < 0) {
-      LOG(info) << "empty pass: " << pass;
-      return;
-    }
-    LOG(info) << "Pass \"" << pass << "\" with size " << size;
-    for (const auto& [par, value] : mParameters.at(pass)) {
-      LOG(info) << "par name = " << par << ", value = " << value;
-    }
-  }
+  void print(const std::string& pass) const;
 
   /// @brief printing function for the full content of the container
-  void print() const
-  {
-    for (const auto& [pass, pars] : mParameters) {
-      print(pass);
-    }
-  }
+  void print() const;
 
   /// @brief Getter of the full map of parameters stored in the container
   /// @return returns the full map of parameters

DataFormats/Detectors/TOF/src/DataFormatsParamTOFLinkDef.h

@@ -0,0 +1,17 @@
+// 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.
+
+#ifdef __CLING__
+
+#pragma link C++ class o2::tof::Parameters < 5> + ;
+#pragma link C++ class o2::tof::ParameterCollection + ;
+
+#endif

DataFormats/Detectors/TOF/src/DataFormatsTOFLinkDef.h

@@ -33,8 +33,6 @@
 
 #pragma link C++ class std::vector < o2::dataformats::CalibInfoTOFshort> + ;
 #pragma link C++ class std::vector < o2::dataformats::CalibInfoTOF> + ;
-#pragma link C++ class o2::tof::Parameters < 5> + ;
-#pragma link C++ class o2::tof::ParameterCollection + ;
 
 #pragma link C++ class o2::tof::CTFHeader + ;
 #pragma link C++ class o2::tof::CompressedInfos + ;

DataFormats/Detectors/TOF/src/ParameterContainers.cxx

@@ -0,0 +1,62 @@
+// 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.
+
+/// \file   ParameterContainers.h
+/// \author Francesco Noferini
+/// \author Nicolò Jacazio [email protected]
+/// @since  2022-11-08
+/// \brief  Implementation of the containers for the general parameters
+
+#include "DataFormatsTOF/ParameterContainers.h"
+
+// ClassImp(o2::tof::Parameters);
+using namespace o2::tof;
+
+bool ParameterCollection::addParameter(const std::string& pass, const std::string& parName, float value)
+{
+  const bool alreadyPresent = hasKey(pass);
+  if (alreadyPresent) {
+    LOG(debug) << "Changing parametrization corresponding to key " << pass << " from size " << mParameters[pass].size() << " to " << parName;
+  } else {
+    mParameters[pass] = std::unordered_map<std::string, paramvar_t>{};
+    LOG(debug) << "Adding new parametrization corresponding to key " << pass << ": " << parName;
+  }
+  mParameters[pass][parName] = value;
+  return true;
+}
+
+int ParameterCollection::getSize(const std::string& pass) const
+{
+  if (!hasKey(pass)) {
+    return -1;
+  }
+  return mParameters.at(pass).size();
+}
+
+void ParameterCollection::print() const
+{
+  for (const auto& [pass, pars] : mParameters) {
+    print(pass);
+  }
+}
+
+void ParameterCollection::print(const std::string& pass) const
+{
+  const auto& size = getSize(pass);
+  if (size < 0) {
+    LOG(info) << "empty pass: " << pass;
+    return;
+  }
+  LOG(info) << "Pass \"" << pass << "\" with size " << size;
+  for (const auto& [par, value] : mParameters.at(pass)) {
+    LOG(info) << "par name = " << par << ", value = " << value;
+  }
+}

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -2126,9 +2126,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
                          0,
                          sourceID);
         }
-        if (sourceID != 0 || !mUseSigFiltMC) {
-          mcColToEvSrc.emplace_back(std::vector<int>{iCol, sourceID, eventID}); // point background and injected signal events to one collision
-        }
+        mcColToEvSrc.emplace_back(std::vector<int>{iCol, sourceID, eventID}); // point background and injected signal events to one collision
       }
     }
   }

Detectors/TOF/base/src/Geo.cxx

@@ -1049,8 +1049,8 @@ void Geo::rotateToSector(Float_t* xyz, Int_t isector)
 void Geo::alignedToNominalSector(Float_t* xyz, Int_t isector)
 {
   // rotate from the aligned sector frame coordinates to nominal ones (i.e. alpha=20*sector+10 deg.)
-  constexpr float CS[18] = {.848077e-01, 8.660254e-01, 6.427876e-01, 3.420202e-01, -4.371139e-08, -3.420201e-01, -6.427876e-01, -8.660254e-01, -9.848077e-01, -9.848077e-01, -8.660254e-01, -6.427875e-01, -3.420201e-01, 1.192488e-08, 3.420201e-01, 6.427875e-01, 8.660253e-01, 9.848078e-01};
-  constexpr float SN[18] = {1.736482e-01, 5.000000e-01, 7.660444e-01, 9.396926e-01, 1.000000e+00, 9.396926e-01, 7.660444e-01, 5.000001e-01, 1.736483e-01, -1.736482e-01, -5.000000e-01, -7.660446e-01, -9.396927e-01, -1.000000e+00, -9.396926e-01, -7.660445e-01, -5.000002e-01, -1.736480e-01};
+  constexpr float CS[18] = {+9.848078e-01, +8.660254e-01, +6.427876e-01, +3.420201e-01, +6.123234e-17, -3.420201e-01, -6.427876e-01, -8.660254e-01, -9.848078e-01, -9.848078e-01, -8.660254e-01, -6.427876e-01, -3.420201e-01, -1.836970e-16, +3.420201e-01, +6.427876e-01, +8.660254e-01, +9.848078e-01};
+  constexpr float SN[18] = {+1.736482e-01, +5.000000e-01, +7.660444e-01, +9.396926e-01, +1.000000e+00, +9.396926e-01, +7.660444e-01, +5.000000e-01, +1.736482e-01, -1.736482e-01, -5.000000e-01, -7.660444e-01, -9.396926e-01, -1.000000e+00, -9.396926e-01, -7.660444e-01, -5.000000e-01, -1.736482e-01};
   Float_t xyzDummy[3] = {xyz[1], xyz[2], xyz[0]};      // go to twisted coordinates...
   o2::tof::Geo::antiRotateToSector(xyzDummy, isector); // lab coordinates
   xyz[0] = xyzDummy[0] * CS[isector] + xyzDummy[1] * SN[isector];

Detectors/TOF/workflow/src/make-parameter-collection.cxx

@@ -63,7 +63,7 @@ class ParamExample : public Parameters<5>
  public:
   ParamExample() : Parameters(std::array<std::string, 5>{"p0", "p1", "p2", "p3", "p4"},
                               "ParamExample") { setParameters(std::array<paramvar_t, 5>{0, 1, 2, 3, 4}); }; // Default constructor with default parameters
-  ~ParamExample() override = default;
+  ~ParamExample() = default;
 };
 
 int main(int argc, char* argv[])

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/SegmentationChip.h

@@ -35,18 +35,18 @@ class SegmentationChip
   // The "detector coordinate system" refers to the hit position in row,col inside the sensor
   // This class provides the transformations from the local and detector coordinate systems
   // The conversion between global and local coordinate systems is operated by the transformation matrices
-  // For the curved VD layers there exist three coordinate systems and one is transient.
+  // For the curved VD layers there exist four coordinate systems.
   // 1. The global (curved) coordinate system. The chip's center of coordinate system is
   //    defined at the the mid-point of the detector.
-  // 2. The local (flat) coordinate system. This is the tube segment projected onto a flat
-  //    surface. In the projection we implicitly assume that the inner and outer
-  //    stretch does not depend on the radius.
-  // 3. The detector coordinate system. Defined by the row and column segmentation
-  //    defined at the upper edge in the flat coord.
+  // 2. The local (curved) coordinate system, centered in 0,0,0.
+  // 3. The local (flat) coordinate system. This is the tube segment projected onto a flat
+  //    surface, centered in the middle of the chip, with the y axis pointing towards the interaction point.
+  //    In the projection we implicitly assume that the inner and outer stretch does not depend on the radius.
+  // 4. The detector coordinate system. Defined by the row and column segmentation.
   // For the flat ML and OT layers, there exist two coordinate systems:
   // 1. The global (flat) coordinate system. The chip's center of coordinate system is
   //    defined at the the mid-point of the detector.
-  // 2. The detector coordinate system. Defined by the row and column segmentation
+  // 2. The detector coordinate system. Defined by the row and column segmentation.
   // TODO: add segmentation for VD disks
 
  public:
@@ -121,15 +121,20 @@ class SegmentationChip
       pitchCol = PitchColMLOT;
       maxWidth = constants::ML::width;
       maxLength = constants::ML::length;
-    } else if (subDetID == 1 && layer >= 4) { // OT
+    } else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
       pitchRow = PitchRowMLOT;
       pitchCol = PitchColMLOT;
-      maxWidth = constants::OT::width;
-      maxLength = constants::OT::length;
+      maxWidth = constants::OT::halfstave::width;
+      maxLength = constants::ML::length;
+    } else if (subDetID == 1 && layer > 4) { // OT
+      pitchRow = PitchRowMLOT;
+      pitchCol = PitchColMLOT;
+      maxWidth = constants::OT::halfstave::width;
+      maxLength = constants::OT::halfstave::length;
     }
     // convert to row/col
-    iRow = static_cast<int>(std::floor((maxWidth / 2 - xRow) / pitchRow));
-    iCol = static_cast<int>(std::floor((zCol + maxLength / 2) / pitchCol));
+    iRow = static_cast<int>(((maxWidth / 2 - xRow) / pitchRow));
+    iCol = static_cast<int>(((zCol + maxLength / 2) / pitchCol));
   };
 
   // Check local coordinates (cm) validity.
@@ -143,9 +148,12 @@ class SegmentationChip
     } else if (subDetID == 1 && layer <= 3) { // ML
       maxWidth = constants::ML::width;
       maxLength = constants::ML::length;
-    } else if (subDetID == 1 && layer >= 4) { // OT
-      maxWidth = constants::OT::width;
-      maxLength = constants::OT::length;
+    } else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
+      maxWidth = constants::OT::halfstave::width;
+      maxLength = constants::ML::length;
+    } else if (subDetID == 1 && layer > 4) { // OT
+      maxWidth = constants::OT::halfstave::width;
+      maxLength = constants::OT::halfstave::length;
     }
     return (-maxWidth / 2 < x && x < maxWidth / 2 && -maxLength / 2 < z && z < maxLength / 2);
   }
@@ -162,9 +170,12 @@ class SegmentationChip
     } else if (subDetID == 1 && layer <= 3) { // ML
       nRows = constants::ML::nRows;
       nCols = constants::ML::nCols;
-    } else if (subDetID == 1 && layer >= 4) { // OT
-      nRows = constants::OT::nRows;
-      nCols = constants::OT::nCols;
+    } else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
+      nRows = constants::OT::halfstave::nRows;
+      nCols = constants::ML::nCols;
+    } else if (subDetID == 1 && layer > 4) { // OT
+      nRows = constants::OT::halfstave::nRows;
+      nCols = constants::OT::halfstave::nCols;
     }
     return (row >= 0 && row < static_cast<float>(nRows) && col >= 0 && col < static_cast<float>(nCols));
   }
@@ -210,9 +221,12 @@ class SegmentationChip
     } else if (subDetID == 1 && layer <= 3) { // ML
       xRow = 0.5 * (constants::ML::width - PitchRowMLOT) - (row * PitchRowMLOT);
       zCol = col * PitchRowMLOT + 0.5 * (PitchRowMLOT - constants::ML::length);
-    } else if (subDetID == 1 && layer >= 4) { // OT
-      xRow = 0.5 * (constants::OT::width - PitchRowMLOT) - (row * PitchRowMLOT);
-      zCol = col * PitchColMLOT + 0.5 * (PitchColMLOT - constants::OT::length);
+    } else if (subDetID == 1 && layer == 4) { // ML/OT (mixed layer, length = ML but staggered as OT)
+      xRow = 0.5 * (constants::OT::halfstave::width - PitchRowMLOT) - (row * PitchRowMLOT);
+      zCol = col * PitchRowMLOT + 0.5 * (PitchRowMLOT - constants::ML::length);
+    } else if (subDetID == 1 && layer > 4) { // OT
+      xRow = 0.5 * (constants::OT::halfstave::width - PitchRowMLOT) - (row * PitchRowMLOT);
+      zCol = col * PitchColMLOT + 0.5 * (PitchColMLOT - constants::OT::halfstave::length);
     }
   }
 
@@ -263,17 +277,25 @@ class SegmentationChip
   }
 
   /// Print segmentation info
-  static const void Print() noexcept
+  static void Print() noexcept
   {
     LOG(info) << "Number of rows:\nVD L0: " << constants::VD::petal::layer::nRows[0]
               << "\nVD L1: " << constants::VD::petal::layer::nRows[1]
               << "\nVD L2: " << constants::VD::petal::layer::nRows[2]
               << "\nML stave: " << constants::ML::nRows
-              << "\nOT stave: " << constants::OT::nRows;
+              << "\nOT half stave: " << constants::OT::halfstave::nRows;
 
     LOG(info) << "Number of cols:\nVD: " << constants::VD::petal::layer::nCols
               << "\nML stave: " << constants::ML::nCols
-              << "\nOT stave: " << constants::OT::nCols;
+              << "\nOT half stave: " << constants::OT::halfstave::nCols;
+
+    LOG(info) << "Pitch rows [cm]:\nVD: " << PitchRowVD
+              << "\nML stave: " << PitchRowMLOT
+              << "\nOT stave: " << PitchRowMLOT;
+
+    LOG(info) << "Pitch cols [cm]:\nVD: " << PitchColVD
+              << "\nML stave: " << PitchColMLOT
+              << "\nOT stave: " << PitchColMLOT;
   }
 };