Skip to content

Commit 02e7bf3

Browse files
chiarazampollisawenzel
chiarazampolli
authored and
sawenzel
committed
Initial TOF reconstruction and track matching code (#1486)
* Track matching * Adding classes for TOF matching * Taking the TPC track after the outwards propagation * Propagate the TrackTPC corresponding to the track to match * Getter and Setter of the value of the number of sigma to cut for the matching * Use TPCITS track for TOF matching * Load geometry for DPL processing * TOF digitizer switch to vector of vectors for digits * timestamp removed from TOF digits and other fixes (#6) * Important changes in digitizer output and matching - Digitizer output is now a vector of vectors (each "sub-vector" is per TOF readout frame) - Matching now seems to work (but we still don't check the time) * Tof rec (#8) * move tof digitizer to vec of vecs also for MC labels * ad TOF test MC generator * git-clang-format - again
1 parent 2de5f5e commit 02e7bf3

30 files changed

Lines changed: 1856 additions & 120 deletions

File tree

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

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include "ReconstructionDataFormats/BaseCluster.h"
1818
#include <boost/serialization/base_object.hpp> // for base_object
19+
#include <TMath.h>
20+
#include <cstdlib>
1921

2022
namespace o2
2123
{
@@ -27,6 +29,9 @@ namespace tof
2729

2830
class Cluster : public o2::BaseCluster<float>
2931
{
32+
static constexpr float RadiusOutOfRange = 9999; // used to check if the radius was already calculated or not
33+
static constexpr float PhiOutOfRange = 9999; // used to check if phi was already calculated or not
34+
3035
public:
3136
enum { kMain = 0x3FFFF,
3237
kUpLeft = 0x40000, // 2^18, 19th bit
@@ -40,23 +45,44 @@ class Cluster : public o2::BaseCluster<float>
4045

4146
Cluster() = default;
4247

43-
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);
48+
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);
4449

4550
~Cluster() = default;
4651

47-
float getTimeRaw() const { return mTimeRaw; } // Cluster ToF getter
48-
void setTimeRaw(float timeRaw) { mTimeRaw = timeRaw; } // Cluster ToF setter
49-
float getTime() const { return mTime; } // Cluster ToF getter
50-
void setTime(float time) { mTime = time; } // Cluster ToF setter
52+
void setBaseData(std::int16_t sensid, float x, float y, float z, float sy2, float sz2, float syz);
53+
54+
double getTimeRaw() const { return mTimeRaw; } // Cluster ToF getter
55+
void setTimeRaw(double timeRaw) { mTimeRaw = timeRaw; } // Cluster ToF setter
56+
double getTime() const { return mTime; } // Cluster ToF getter
57+
void setTime(double time) { mTime = time; } // Cluster ToF setter
5158
float getTot() const { return mTot; } // Cluster Charge getter
5259
void setTot(int tot) { mTot = tot; } // Cluster ToT setter
5360
int getL0L1Latency() const { return mL0L1Latency; }; // L0L1 latency
5461
void setL0L1Latency(int value) { mL0L1Latency = value; }; // L0-L1 latency
5562
int getDeltaBC() const { return mDeltaBC; }; // deltaBC
5663
void setDeltaBC(int value) { mDeltaBC = value; }; // deltaBC
5764
//float getZ() const {return mZ;} // Cluster Z - already in the definition of the cluster
58-
float getR() const { return mR; } // Cluster Radius
59-
float getPhi() const { return mPhi; } // Cluster Phi
65+
float getR()
66+
{
67+
if (mR == RadiusOutOfRange) {
68+
mR = TMath::Sqrt(getX() * getX() + getY() * getY() + getZ() * getZ());
69+
}
70+
return mR;
71+
} // Cluster Radius
72+
float getPhi()
73+
{
74+
if (mPhi == PhiOutOfRange) {
75+
mPhi = TMath::ATan2(getY(), getX());
76+
}
77+
return mPhi;
78+
} // Cluster Phi
79+
int getSector()
80+
{
81+
if (mSector == -1) {
82+
mSector = (TMath::ATan2(-getY(), -getX()) + TMath::Pi()) * TMath::RadToDeg() * 0.05;
83+
}
84+
return mSector;
85+
} // Cluster Sector
6086

6187
int getContributingChannels() const { return mContributingChannels; }
6288
void setContributingChannels(int contributingChannels) { mContributingChannels = contributingChannels; }
@@ -104,14 +130,15 @@ class Cluster : public o2::BaseCluster<float>
104130
private:
105131
friend class boost::serialization::access;
106132

107-
float mTimeRaw; // raw TOF time // CZ: in AliRoot it is a double
108-
float mTime; // calibrated TOF time // CZ: in AliRoot it is a double
133+
double mTimeRaw; // raw TOF time // CZ: in AliRoot it is a double
134+
double mTime; // calibrated TOF time // CZ: in AliRoot it is a double
109135
float mTot; // Time-Over-threshold // CZ: in AliRoot it is a double
110136
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)
111137
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)
112138
//float mZ; //! z-coordinate // CZ: to be verified if it is the same in the BaseCluster class
113-
float mR; //! radius
114-
float mPhi; //! phi coordinate
139+
float mR = RadiusOutOfRange; //! radius
140+
float mPhi = PhiOutOfRange; //! phi coordinate
141+
int mSector = -1; //! sector number
115142
int mContributingChannels; // index of the channels that contributed to the cluster; to be read like this:
116143
// channel & 0x3FFFF -> first 18 bits to store the main channel
117144
// channel & bit19 (0x40000) -> alsoUPLEFT
@@ -126,7 +153,7 @@ class Cluster : public o2::BaseCluster<float>
126153
ClassDefNV(Cluster, 1);
127154
};
128155

129-
std::ostream& operator<<(std::ostream& os, const Cluster& c);
156+
std::ostream& operator<<(std::ostream& os, Cluster& c);
130157
} // namespace TOF
131158
} // namespace o2
132159
#endif

‎DataFormats/Detectors/TOF/src/Cluster.cxx‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "DataFormatsTOF/Cluster.h"
1515
#include "FairLogger.h"
1616

17-
#include <TMath.h>
1817
#include <TString.h>
1918

2019
#include <cstdlib>
@@ -23,14 +22,26 @@ using namespace o2::tof;
2322

2423
ClassImp(o2::tof::Cluster);
2524

26-
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)
25+
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)
2726
{
2827

2928
// caching R and phi
3029
mR = TMath::Sqrt(x * x + y * y);
3130
mPhi = TMath::ATan2(y, x);
31+
mSector = (TMath::ATan2(-getY(), -getX()) + TMath::Pi()) * TMath::RadToDeg() * 0.05;
3232
}
33+
//______________________________________________________________________
34+
void Cluster::setBaseData(std::int16_t sensid, float x, float y, float z, float sy2, float sz2, float syz)
35+
{
36+
setSensorID(sensid);
37+
setXYZ(x, y, z);
38+
setErrors(sy2, sz2, syz);
3339

40+
// caching R and phi
41+
mR = TMath::Sqrt(x * x + y * y);
42+
mPhi = TMath::ATan2(y, x);
43+
mSector = (TMath::ATan2(-getY(), -getX()) + TMath::Pi()) * TMath::RadToDeg() * 0.05;
44+
}
3445
//______________________________________________________________________
3546
int Cluster::getNumOfContributingChannels() const
3647
{
@@ -63,7 +74,7 @@ int Cluster::getNumOfContributingChannels() const
6374
}
6475

6576
//______________________________________________________________________
66-
std::ostream& operator<<(std::ostream& os, const Cluster& c)
77+
std::ostream& operator<<(std::ostream& os, Cluster& c)
6778
{
6879
os << (o2::BaseCluster<float>&)c;
6980
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‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ set(SRCS
77
src/BaseCluster.cxx
88
src/TrackTPCITS.cxx
99
src/Vertex.cxx
10+
src/MatchInfoTOF.cxx
1011
)
1112

1213
Set(HEADERS
1314
include/${MODULE_NAME}/Track.h
1415
include/${MODULE_NAME}/BaseCluster.h
1516
include/${MODULE_NAME}/TrackTPCITS.h
1617
include/${MODULE_NAME}/Vertex.h
18+
include/${MODULE_NAME}/MatchInfoTOF.h
1719
)
1820

1921
Set(LINKDEF src/ReconstructionDataFormatsLinkDef.h)

‎DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// Copyright CERN and copyright holders of ALICE O2. This software is
2+
// distributed under the terms of the GNU General Public License v3 (GPL
3+
// Version 3), copied verbatim in the file "COPYING".
4+
//
5+
// See http://alice-o2.web.cern.ch/license for full licensing information.
6+
//
7+
// In applying this license CERN does not waive the privileges and immunities
8+
// granted to it by virtue of its status as an Intergovernmental Organization
9+
// or submit itself to any jurisdiction.
10+
11+
/// \file MatchInfoTOF.h
12+
/// \brief Class to store the output of the matching to TOF
13+
14+
#ifndef ALICEO2_MATCHINFOTOF_H
15+
#define ALICEO2_MATCHINFOTOF_H
16+
17+
namespace o2
18+
{
19+
namespace dataformats
20+
{
21+
class MatchInfoTOF
22+
{
23+
public:
24+
MatchInfoTOF(int indexTOFCl, float chi2) : mTOFClIndex(indexTOFCl), mChi2(chi2){};
25+
MatchInfoTOF() = default;
26+
void setTOFClIndex(int index) { mTOFClIndex = index; }
27+
int getTOFClIndex() const { return mTOFClIndex; }
28+
29+
void setChi2(int chi2) { mChi2 = chi2; }
30+
float getChi2() const { return mChi2; }
31+
32+
private:
33+
int mTOFClIndex; // index of the TOF cluster used for the matching
34+
float mChi2; // chi2 of the pair track-TOFcluster
35+
36+
// ClassDefNV(MatchInfoTOF, 1);
37+
};
38+
}
39+
}
40+
#endif

‎DataFormats/Reconstruction/src/MatchInfoTOF.cxx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright CERN and copyright holders of ALICE O2. This software is
2+
// distributed under the terms of the GNU General Public License v3 (GPL
3+
// Version 3), copied verbatim in the file "COPYING".
4+
//
5+
// See http://alice-o2.web.cern.ch/license for full licensing information.
6+
//
7+
// In applying this license CERN does not waive the privileges and immunities
8+
// granted to it by virtue of its status as an Intergovernmental Organization
9+
// or submit itself to any jurisdiction.
10+
11+
/// \file MatchInfoTOF.cxx
12+
/// \brief Class to store the output of the matching to TOF
13+
14+
#include "ReconstructionDataFormats/MatchInfoTOF.h"
15+
16+
using namespace o2::dataformats;
17+
18+
//ClassImp(o2::dataformats::MatchInfoTOF);

‎DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#pragma link C++ class o2::track::TrackParCov + ;
1919
#pragma link C++ class o2::BaseCluster < float > +;
2020
#pragma link C++ class o2::dataformats::TrackTPCITS + ;
21+
#pragma link C++ class o2::dataformats::MatchInfoTOF + ;
2122

2223
#pragma link C++ class o2::dataformats::Vertex < int > +;
2324
#pragma link C++ class o2::dataformats::Vertex < o2::dataformats::TimeStamp < int >> +;

‎Detectors/GlobalTracking/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ O2_SETUP(NAME ${MODULE_NAME})
44

55
set(SRCS
66
src/MatchTPCITS.cxx
7+
src/MatchTOF.cxx
78
)
89

910
set(HEADERS
1011
include/${MODULE_NAME}/MatchTPCITS.h
12+
include/${MODULE_NAME}/MatchTOF.h
1113
)
1214

1315
set(LINKDEF src/GlobalTrackingLinkDef.h)

0 commit comments

Comments
 (0)