Skip to content

Commit 001ae07

Browse files
chiarazampollishahor02
authored andcommitted
Revert "fix in track propagation to TOF for MC (#13784)"
This reverts commit 7e24578. Needed for apass1 of PbPb 2024 which was calibrated with the issue, so if we apply this fix, the TOF times will not be centered at zero.
1 parent 6fa29aa commit 001ae07

File tree

4 files changed

+14
-145
lines changed

4 files changed

+14
-145
lines changed

DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MatchInfoTOF
2828
using GTrackID = o2::dataformats::GlobalTrackID;
2929

3030
public:
31-
MatchInfoTOF(int idLocal, int idxTOFCl, double time, float chi2, o2::track::TrackLTIntegral trkIntLT, GTrackID idxTrack, float dt = 0, float z = 0, float dx = 0, float dz = 0, float dy = 0) : mIdLocal(idLocal), mIdxTOFCl(idxTOFCl), mSignal(time), mChi2(chi2), mIntLT(trkIntLT), mIdxTrack(idxTrack), mDeltaT(dt), mZatTOF(z), mDXatTOF(dx), mDZatTOF(dz), mDYatTOF(dy){};
31+
MatchInfoTOF(int idLocal, int idxTOFCl, double time, float chi2, o2::track::TrackLTIntegral trkIntLT, GTrackID idxTrack, float dt = 0, float z = 0, float dx = 0, float dz = 0) : mIdLocal(idLocal), mIdxTOFCl(idxTOFCl), mSignal(time), mChi2(chi2), mIntLT(trkIntLT), mIdxTrack(idxTrack), mDeltaT(dt), mZatTOF(z), mDXatTOF(dx), mDZatTOF(dz){};
3232
MatchInfoTOF() = default;
3333
void setIdxTOFCl(int index) { mIdxTOFCl = index; }
3434
void setIdxTrack(GTrackID index) { mIdxTrack = index; }
@@ -59,8 +59,6 @@ class MatchInfoTOF
5959
float getDZatTOF() const { return mDZatTOF; }
6060
void setDXatTOF(float val) { mDXatTOF = val; }
6161
float getDXatTOF() const { return mDXatTOF; }
62-
void setDYatTOF(float val) { mDYatTOF = val; }
63-
float getDYatTOF() const { return mDYatTOF; }
6462
void setSignal(double time) { mSignal = time; }
6563
double getSignal() const { return mSignal; }
6664

@@ -80,7 +78,6 @@ class MatchInfoTOF
8078
float mZatTOF = 0.0; ///< Z position at TOF
8179
float mDXatTOF = 0.0; ///< DX position at TOF
8280
float mDZatTOF = 0.0; ///< DZ position at TOF
83-
float mDYatTOF = 0.0; ///< DY position at TOF
8481
float mDeltaT = 0.0; ///< tTOF - TPC (microsec)
8582
double mSignal = 0.0; ///< TOF time in ps
8683
float mVz = 0.0; ///< Vz from TOF match

DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOFReco.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class MatchInfoTOFReco : public MatchInfoTOF
3535
ITSTPCTRD,
3636
SIZEALL };
3737

38-
MatchInfoTOFReco(int idLocal, int idxTOFCl, double time, float chi2, o2::track::TrackLTIntegral trkIntLT, GTrackID idxTrack, TrackType trkType, float dt = 0, float z = 0, float dx = 0, float dz = 0, float dy = 0) : MatchInfoTOF(idLocal, idxTOFCl, time, chi2, trkIntLT, idxTrack, dt, z, dx, dz, dy), mTrackType(trkType){};
38+
MatchInfoTOFReco(int idLocal, int idxTOFCl, double time, float chi2, o2::track::TrackLTIntegral trkIntLT, GTrackID idxTrack, TrackType trkType, float dt = 0, float z = 0, float dx = 0, float dz = 0) : MatchInfoTOF(idLocal, idxTOFCl, time, chi2, trkIntLT, idxTrack, dt, z, dx, dz), mTrackType(trkType){};
3939

4040
MatchInfoTOFReco() = default;
4141

Detectors/GlobalTracking/include/GlobalTracking/MatchTOF.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,6 @@ class MatchTOF
220220
void BestMatchesHP(std::vector<o2::dataformats::MatchInfoTOFReco>& matchedTracksPairs, std::vector<o2::dataformats::MatchInfoTOF>* matchedTracks, std::vector<int>* matchedTracksIndex, int* matchedClustersIndex, const gsl::span<const o2::ft0::RecPoints>& FITRecPoints, const std::vector<Cluster>& TOFClusWork, std::vector<o2::dataformats::CalibInfoTOF>& CalibInfoTOF, unsigned long Timestamp, bool MCTruthON, const o2::dataformats::MCTruthContainer<o2::MCCompLabel>* TOFClusLabels, const std::vector<o2::MCCompLabel>* TracksLblWork, std::vector<o2::MCCompLabel>* OutTOFLabels);
221221
bool propagateToRefX(o2::track::TrackParCov& trc, float xRef /*in cm*/, float stepInCm /*in cm*/, o2::track::TrackLTIntegral& intLT);
222222
bool propagateToRefXWithoutCov(const o2::track::TrackParCov& trc, float xRef /*in cm*/, float stepInCm /*in cm*/, float bz);
223-
bool propagateToRefXWithoutCov(const o2::track::TrackParCov& trc, float xRef /*in cm*/, float stepInCm /*in cm*/, float bz, float pos[3]);
224-
void updateTL(o2::track::TrackLTIntegral& intLT, float deltal);
225223

226224
void updateTimeDependentParams();
227225

0 commit comments

Comments
 (0)