Skip to content

Commit

Permalink
Revert "fix in track propagation to TOF for MC (#13784)"
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
chiarazampolli committed Dec 19, 2024
1 parent 5a7052d commit d8e1ff0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 145 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MatchInfoTOF
using GTrackID = o2::dataformats::GlobalTrackID;

public:
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){};
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){};
MatchInfoTOF() = default;
void setIdxTOFCl(int index) { mIdxTOFCl = index; }
void setIdxTrack(GTrackID index) { mIdxTrack = index; }
Expand Down Expand Up @@ -59,8 +59,6 @@ class MatchInfoTOF
float getDZatTOF() const { return mDZatTOF; }
void setDXatTOF(float val) { mDXatTOF = val; }
float getDXatTOF() const { return mDXatTOF; }
void setDYatTOF(float val) { mDYatTOF = val; }
float getDYatTOF() const { return mDYatTOF; }
void setSignal(double time) { mSignal = time; }
double getSignal() const { return mSignal; }

Expand All @@ -80,7 +78,6 @@ class MatchInfoTOF
float mZatTOF = 0.0; ///< Z position at TOF
float mDXatTOF = 0.0; ///< DX position at TOF
float mDZatTOF = 0.0; ///< DZ position at TOF
float mDYatTOF = 0.0; ///< DY position at TOF
float mDeltaT = 0.0; ///< tTOF - TPC (microsec)
double mSignal = 0.0; ///< TOF time in ps
float mVz = 0.0; ///< Vz from TOF match
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class MatchInfoTOFReco : public MatchInfoTOF
ITSTPCTRD,
SIZEALL };

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){};
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){};

MatchInfoTOFReco() = default;

Expand Down
2 changes: 0 additions & 2 deletions Detectors/GlobalTracking/include/GlobalTracking/MatchTOF.h
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ class MatchTOF
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);
bool propagateToRefX(o2::track::TrackParCov& trc, float xRef /*in cm*/, float stepInCm /*in cm*/, o2::track::TrackLTIntegral& intLT);
bool propagateToRefXWithoutCov(const o2::track::TrackParCov& trc, float xRef /*in cm*/, float stepInCm /*in cm*/, float bz);
bool propagateToRefXWithoutCov(const o2::track::TrackParCov& trc, float xRef /*in cm*/, float stepInCm /*in cm*/, float bz, float pos[3]);
void updateTL(o2::track::TrackLTIntegral& intLT, float deltal);

void updateTimeDependentParams();

Expand Down
Loading

0 comments on commit d8e1ff0

Please sign in to comment.