Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add fill scheme info in TOF event time checker #7610

Merged
merged 3 commits into from
Nov 17, 2021
Merged

add fill scheme info in TOF event time checker #7610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea6be64
add fill scheme info in TOF event time checker
noferini Nov 14, 2021
e8b92d6
add residuals to check matching
noferini Nov 16, 2021
df02068
fix in time slewing object (too slow to be loaded)
noferini Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions DataFormats/Detectors/TOF/include/DataFormatsTOF/CalibTimeSlewingParamTOF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ class CalibTimeSlewingParamTOF

private:
// TOF channel calibrations
std::array<std::array<int, NCHANNELXSECTOR>, NSECTORS> mChannelStart; ///< array with the index of the first element of a channel in the time slewing vector (per sector)
std::array<std::array<float, NCHANNELXSECTOR>, NSECTORS> mGlobalOffset; ///< array with the sigma of the peak
std::array<std::vector<std::pair<unsigned short, short>>, NSECTORS> mTimeSlewing; ///< array of sector vectors; first element of the pair is TOT (in ps), second is t-texp_pi (in ps)
std::array<std::array<float, NCHANNELXSECTOR>, NSECTORS> mFractionUnderPeak; ///< array with the fraction of entries below the peak
std::array<std::array<float, NCHANNELXSECTOR>, NSECTORS> mSigmaPeak; ///< array with the sigma of the peak
std::array<int, NCHANNELXSECTOR> mChannelStart[NSECTORS]; ///< array with the index of the first element of a channel in the time slewing vector (per sector)
std::array<float, NCHANNELXSECTOR> mGlobalOffset[NSECTORS]; ///< array with the sigma of the peak
std::vector<std::pair<unsigned short, short>> mTimeSlewing[NSECTORS]; ///< array of sector vectors; first element of the pair is TOT (in ps), second is t-texp_pi (in ps)
std::array<float, NCHANNELXSECTOR> mFractionUnderPeak[NSECTORS]; ///< array with the fraction of entries below the peak
std::array<float, NCHANNELXSECTOR> mSigmaPeak[NSECTORS]; ///< array with the sigma of the peak

ClassDefNV(CalibTimeSlewingParamTOF, 2); // class for TOF time slewing params
};
Expand Down
10 changes: 8 additions & 2 deletions DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h
View file
Open in desktop
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) : mIdLocal(idLocal), mIdxTOFCl(idxTOFCl), mSignal(time), mChi2(chi2), mIntLT(trkIntLT), mIdxTrack(idxTrack), mDeltaT(dt), mZatTOF(z){};
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 All @@ -49,6 +49,10 @@ class MatchInfoTOF
float getDeltaT() const { return mDeltaT; }
void setZatTOF(float val) { mZatTOF = val; }
float getZatTOF() const { return mZatTOF; }
void setDZatTOF(float val) { mDZatTOF = val; }
float getDZatTOF() const { return mDZatTOF; }
void setDXatTOF(float val) { mDXatTOF = val; }
float getDXatTOF() const { return mDXatTOF; }
void setSignal(double time) { mSignal = time; }
double getSignal() const { return mSignal; }

Expand All @@ -61,10 +65,12 @@ class MatchInfoTOF
int mIdxTOFCl; ///< Idx for TOF cluster
GTrackID mIdxTrack; ///< Idx for track
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 mDeltaT = 0.0; ///< tTOF - TPC (microsec)
double mSignal = 0.0; ///< TOF time in ps

ClassDefNV(MatchInfoTOF, 4);
ClassDefNV(MatchInfoTOF, 5);
};
} // namespace dataformats
} // namespace o2
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOFReco.h
View file
Open in desktop
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) : MatchInfoTOF(idLocal, idxTOFCl, time, chi2, trkIntLT, idxTrack, dt, z), 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
4 changes: 2 additions & 2 deletions Detectors/GlobalTracking/src/MatchTOF.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ void MatchTOF::doMatching(int sec)
foundCluster = true;
// set event indexes (to be checked)
int eventIndexTOFCluster = mTOFClusSectIndexCache[indices[0]][itof];
mMatchedTracksPairs.emplace_back(cacheTrk[itrk], eventIndexTOFCluster, mTOFClusWork[cacheTOF[itof]].getTime(), chi2, trkLTInt[iPropagation], mTrackGid[type][cacheTrk[itrk]], type, trefTOF.getTime() - (minTrkTime + maxTrkTime) * 0.5); // TODO: check if this is correct!
mMatchedTracksPairs.emplace_back(cacheTrk[itrk], eventIndexTOFCluster, mTOFClusWork[cacheTOF[itof]].getTime(), chi2, trkLTInt[iPropagation], mTrackGid[type][cacheTrk[itrk]], type, trefTOF.getTime() - (minTrkTime + maxTrkTime) * 0.5, 0., resX, resZ); // TODO: check if this is correct!
}
}
}
Expand Down Expand Up @@ -1002,7 +1002,7 @@ void MatchTOF::doMatchingForTPC(int sec)
foundCluster = true;
// set event indexes (to be checked)
int eventIndexTOFCluster = mTOFClusSectIndexCache[indices[0]][itof];
mMatchedTracksPairs.emplace_back(cacheTrk[itrk], eventIndexTOFCluster, mTOFClusWork[cacheTOF[itof]].getTime(), chi2, trkLTInt[ibc][iPropagation], mTrackGid[trkType::UNCONS][cacheTrk[itrk]], trkType::UNCONS, resZ / vdrift * side, trefTOF.getZ()); // TODO: check if this is correct!
mMatchedTracksPairs.emplace_back(cacheTrk[itrk], eventIndexTOFCluster, mTOFClusWork[cacheTOF[itof]].getTime(), chi2, trkLTInt[ibc][iPropagation], mTrackGid[trkType::UNCONS][cacheTrk[itrk]], trkType::UNCONS, resZ / vdrift * side, trefTOF.getZ(), resX, resZ); // TODO: check if this is correct!
}
}
}
Expand Down
Loading