Merging TOF reconstruction code to dev

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

@@ -16,6 +16,8 @@
 
 #include "ReconstructionDataFormats/BaseCluster.h"
 #include <boost/serialization/base_object.hpp> // for base_object
+#include <TMath.h>
+#include <cstdlib>
 
 namespace o2
 {
@@ -27,6 +29,9 @@ namespace tof
 
 class Cluster : public o2::BaseCluster<float>
 {
+  static constexpr float RadiusOutOfRange = 9999; // used to check if the radius was already calculated or not
+  static constexpr float PhiOutOfRange = 9999;    // used to check if phi was already calculated or not
+
  public:
   enum { kMain = 0x3FFFF,
          kUpLeft = 0x40000,     // 2^18, 19th bit
@@ -40,23 +45,44 @@ class Cluster : public o2::BaseCluster<float>
 
   Cluster() = default;
 
-  Cluster(std::int16_t sensid, float x, float y, float z, float sy2, float sz2, float syz, float timeRaw, float time, float tot, int L0L1latency, int deltaBC);
+  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);
 
   ~Cluster() = default;
 
-  float getTimeRaw() const { return mTimeRaw; }             // Cluster ToF getter
-  void setTimeRaw(float timeRaw) { mTimeRaw = timeRaw; }    // Cluster ToF setter
-  float getTime() const { return mTime; }                   // Cluster ToF getter
-  void setTime(float time) { mTime = time; }                // Cluster ToF setter
+  void setBaseData(std::int16_t sensid, float x, float y, float z, float sy2, float sz2, float syz);
+
+  double getTimeRaw() const { return mTimeRaw; }            // Cluster ToF getter
+  void setTimeRaw(double timeRaw) { mTimeRaw = timeRaw; }   // Cluster ToF setter
+  double getTime() const { return mTime; }                  // Cluster ToF getter
+  void setTime(double time) { mTime = time; }               // Cluster ToF setter
   float getTot() const { return mTot; }                     // Cluster Charge getter
   void setTot(int tot) { mTot = tot; }                      // Cluster ToT setter
   int getL0L1Latency() const { return mL0L1Latency; };      // L0L1 latency
   void setL0L1Latency(int value) { mL0L1Latency = value; }; // L0-L1 latency
   int getDeltaBC() const { return mDeltaBC; };              // deltaBC
   void setDeltaBC(int value) { mDeltaBC = value; };         // deltaBC
   //float  getZ()   const   {return mZ;}   // Cluster Z - already in the definition of the cluster
-  float getR() const { return mR; }     // Cluster Radius
-  float getPhi() const { return mPhi; } // Cluster Phi
+  float getR()
+  {
+    if (mR == RadiusOutOfRange) {
+      mR = TMath::Sqrt(getX() * getX() + getY() * getY() + getZ() * getZ());
+    }
+    return mR;
+  } // Cluster Radius
+  float getPhi()
+  {
+    if (mPhi == PhiOutOfRange) {
+      mPhi = TMath::ATan2(getY(), getX());
+    }
+    return mPhi;
+  } // Cluster Phi
+  int getSector()
+  {
+    if (mSector == -1) {
+      mSector = (TMath::ATan2(-getY(), -getX()) + TMath::Pi()) * TMath::RadToDeg() * 0.05;
+    }
+    return mSector;
+  } // Cluster Sector
 
   int getContributingChannels() const { return mContributingChannels; }
   void setContributingChannels(int contributingChannels) { mContributingChannels = contributingChannels; }
@@ -104,14 +130,15 @@ class Cluster : public o2::BaseCluster<float>
  private:
   friend class boost::serialization::access;
 
-  float mTimeRaw;   // raw TOF time // CZ: in AliRoot it is a double
-  float mTime;      // calibrated TOF time // CZ: in AliRoot it is a double
+  double mTimeRaw;  // raw TOF time // CZ: in AliRoot it is a double
+  double mTime;     // calibrated TOF time // CZ: in AliRoot it is a double
   float mTot;       // Time-Over-threshold // CZ: in AliRoot it is a double
   int mL0L1Latency; // L0L1 latency // CZ: is it different per cluster? Checking one ESD file, it seems that it is always the same (see: /alice/data/2017/LHC17n/000280235/pass1/17000280235019.100/AliESDs.root)
   int mDeltaBC;     // DeltaBC --> can it be a char or short? // CZ: is it different per cluster? Checking one ESD file, it seems that it can vary (see: /alice/data/2017/LHC17n/000280235/pass1/17000280235019.100/AliESDs.root)
   //float  mZ;           //! z-coordinate // CZ: to be verified if it is the same in the BaseCluster class
-  float mR;                  //! radius
-  float mPhi;                //! phi coordinate
+  float mR = RadiusOutOfRange; //! radius
+  float mPhi = PhiOutOfRange;  //! phi coordinate
+  int mSector = -1;            //! sector number
   int mContributingChannels; // index of the channels that contributed to the cluster; to be read like this:
                              // channel & 0x3FFFF -> first 18 bits to store the main channel
                              // channel & bit19 (0x40000) -> alsoUPLEFT
@@ -126,7 +153,7 @@ class Cluster : public o2::BaseCluster<float>
   ClassDefNV(Cluster, 1);
 };
 
-std::ostream& operator<<(std::ostream& os, const Cluster& c);
+std::ostream& operator<<(std::ostream& os, Cluster& c);
 } // namespace TOF
 } // namespace o2
 #endif

DataFormats/Detectors/TOF/src/Cluster.cxx

@@ -14,7 +14,6 @@
 #include "DataFormatsTOF/Cluster.h"
 #include "FairLogger.h"
 
-#include <TMath.h>
 #include <TString.h>
 
 #include <cstdlib>
@@ -23,14 +22,26 @@ using namespace o2::tof;
 
 ClassImp(o2::tof::Cluster);
 
-Cluster::Cluster(std::int16_t sensid, float x, float y, float z, float sy2, float sz2, float syz, float timeRaw, float time, float tot, int L0L1Latency, int deltaBC) : o2::BaseCluster<float>(sensid, x, y, z, sy2, sz2, syz), mTimeRaw(timeRaw), mTime(time), mTot(tot), mL0L1Latency(L0L1Latency), mDeltaBC(deltaBC), mContributingChannels(0)
+Cluster::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) : o2::BaseCluster<float>(sensid, x, y, z, sy2, sz2, syz), mTimeRaw(timeRaw), mTime(time), mTot(tot), mL0L1Latency(L0L1Latency), mDeltaBC(deltaBC), mContributingChannels(0)
 {
 
   // caching R and phi
   mR = TMath::Sqrt(x * x + y * y);
   mPhi = TMath::ATan2(y, x);
+  mSector = (TMath::ATan2(-getY(), -getX()) + TMath::Pi()) * TMath::RadToDeg() * 0.05;
 }
+//______________________________________________________________________
+void Cluster::setBaseData(std::int16_t sensid, float x, float y, float z, float sy2, float sz2, float syz)
+{
+  setSensorID(sensid);
+  setXYZ(x, y, z);
+  setErrors(sy2, sz2, syz);
 
+  // caching R and phi
+  mR = TMath::Sqrt(x * x + y * y);
+  mPhi = TMath::ATan2(y, x);
+  mSector = (TMath::ATan2(-getY(), -getX()) + TMath::Pi()) * TMath::RadToDeg() * 0.05;
+}
 //______________________________________________________________________
 int Cluster::getNumOfContributingChannels() const
 {
@@ -63,7 +74,7 @@ int Cluster::getNumOfContributingChannels() const
 }
 
 //______________________________________________________________________
-std::ostream& operator<<(std::ostream& os, const Cluster& c)
+std::ostream& operator<<(std::ostream& os, Cluster& c)
 {
   os << (o2::BaseCluster<float>&)c;
   os << " TOF cluster: raw time = " << std::scientific << c.getTimeRaw() << ", time = " << std::scientific << c.getTime() << ", Tot = " << std::scientific << c.getTot() << ", L0L1Latency = " << c.getL0L1Latency() << ", deltaBC = " << c.getDeltaBC() << ", R = " << c.getR() << ", mPhi = " << c.getPhi() << ", ContributingChannels = " << c.getNumOfContributingChannels() << "\n";

DataFormats/Reconstruction/CMakeLists.txt

@@ -7,13 +7,15 @@ set(SRCS
   src/BaseCluster.cxx
   src/TrackTPCITS.cxx
   src/Vertex.cxx
+  src/MatchInfoTOF.cxx
 )
 
 Set(HEADERS
   include/${MODULE_NAME}/Track.h
   include/${MODULE_NAME}/BaseCluster.h
   include/${MODULE_NAME}/TrackTPCITS.h
   include/${MODULE_NAME}/Vertex.h
+  include/${MODULE_NAME}/MatchInfoTOF.h
 )
 
 Set(LINKDEF src/ReconstructionDataFormatsLinkDef.h)

DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h

@@ -0,0 +1,40 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// 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 MatchInfoTOF.h
+/// \brief Class to store the output of the matching to TOF
+
+#ifndef ALICEO2_MATCHINFOTOF_H
+#define ALICEO2_MATCHINFOTOF_H
+
+namespace o2
+{
+namespace dataformats
+{
+class MatchInfoTOF
+{
+ public:
+  MatchInfoTOF(int indexTOFCl, float chi2) : mTOFClIndex(indexTOFCl), mChi2(chi2){};
+  MatchInfoTOF() = default;
+  void setTOFClIndex(int index) { mTOFClIndex = index; }
+  int getTOFClIndex() const { return mTOFClIndex; }
+
+  void setChi2(int chi2) { mChi2 = chi2; }
+  float getChi2() const { return mChi2; }
+
+ private:
+  int mTOFClIndex; // index of the TOF cluster used for the matching
+  float mChi2;     // chi2 of the pair track-TOFcluster
+
+  //  ClassDefNV(MatchInfoTOF, 1);
+};
+}
+}
+#endif

DataFormats/Reconstruction/src/MatchInfoTOF.cxx

@@ -0,0 +1,18 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// 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 MatchInfoTOF.cxx
+/// \brief Class to store the output of the matching to TOF
+
+#include "ReconstructionDataFormats/MatchInfoTOF.h"
+
+using namespace o2::dataformats;
+
+//ClassImp(o2::dataformats::MatchInfoTOF);

DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h

@@ -18,6 +18,7 @@
 #pragma link C++ class o2::track::TrackParCov + ;
 #pragma link C++ class o2::BaseCluster < float > +;
 #pragma link C++ class o2::dataformats::TrackTPCITS + ;
+#pragma link C++ class o2::dataformats::MatchInfoTOF + ;
 
 #pragma link C++ class o2::dataformats::Vertex < int > +;
 #pragma link C++ class o2::dataformats::Vertex < o2::dataformats::TimeStamp < int >> +;

DataFormats/simulation/src/SimulationDataLinkDef.h

@@ -37,6 +37,7 @@
 #pragma link C++ struct o2::dataformats::MCTruthHeaderElement + ;
 #pragma link C++ class o2::dataformats::MCTruthContainer < long > +;
 #pragma link C++ class o2::dataformats::MCTruthContainer < o2::MCCompLabel > +;
+#pragma link C++ class std::vector < o2::dataformats::MCTruthContainer < o2::MCCompLabel >> +;
 #pragma link C++ class std::vector < o2::MCCompLabel > +;
 #pragma link C++ class std::vector < o2::dataformats::MCTruthHeaderElement > +;
 

Detectors/GlobalTracking/CMakeLists.txt

@@ -4,10 +4,12 @@ O2_SETUP(NAME ${MODULE_NAME})
 
 set(SRCS
    src/MatchTPCITS.cxx
+   src/MatchTOF.cxx
 )
 
 set(HEADERS
    include/${MODULE_NAME}/MatchTPCITS.h
+   include/${MODULE_NAME}/MatchTOF.h
 )
 
 set(LINKDEF src/GlobalTrackingLinkDef.h)