Skip to content

TPC SCD: add clampTgSlp to keep residuals beyond MaxTgSlp #15839

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

Open
matthias-kleiner wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

TPC SCD: add clampTgSlp to keep residuals beyond MaxTgSlp #15839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Detectors/TPC/calibration/SpacePoints/include/SpacePoints/SpacePointsCalibConfParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct SpacePointsCalibConfParam : public o2::conf::ConfigurableParamHelper<Spac
// other settings for track interpolation
float sigYZ2TOF{.75f}; ///< for now assume cluster error for TOF equal for all clusters in both Y and Z
float maxSnp{.85f}; ///< max snp when propagating tracks
bool clampTgSlp{false}; ///< store TPC cluster residuals with |tan(phi)| >= param::MaxTgSlp saturated (tgSlp = +-0x7fff, see UnbinnedResid::isTgSlpClamped) instead of dropping them: the cut is on the reference track's direction, so dropping selects on the reference's error
float maxStep{2.f}; ///< maximum step for propagation
bool debugTRDTOF{false}; ///< if true, ITS-TPC-TRD-TOF tracks and their seeding ITS-TPC-TRD track will both be interpolated and their residuals stored

Expand Down
2 changes: 2 additions & 0 deletions Detectors/TPC/calibration/SpacePoints/include/SpacePoints/TrackInterpolation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ struct UnbinnedResid {
short channel{-1}; ///< extra channel info (ITS chip ID, TRD chamber, TOF main pad within the sector)
bool rejected{false}; ///< residual is flagged as rejected in the validateTrack

/// true if tgSlp was saturated at +-param::MaxTgSlp (scdcalib.clampTgSlp): unclamped values have |tgSlp| <= 0x7fff - 1
bool isTgSlpClamped() const { return tgSlp == 0x7fff || tgSlp == -0x7fff; }
bool isTPC() const { return row < constants::MAXGLOBALPADROW; }
bool isTRD() const { return row >= 160 && row < 166; }
bool isTOF() const { return row == 170; }
Expand Down
5 changes: 5 additions & 0 deletions Detectors/TPC/calibration/SpacePoints/macro/staticMapCreator.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,11 @@ void staticMapCreator(std::string fileInput = "files.txt",
if (useResidualsForVd && residualsVd.size() < 10'000'000UL) {
residualsVd.push_back(residIn);
}
if (residIn.isTgSlpClamped()) {
// scdcalib.clampTgSlp: tgSlp saturated -- the voxel fit (dX from dY vs tan(phi)) and the map correction below
// use it, so keep this residual out of the binned residuals
continue;
}
int sec = residIn.sec;
auto& residVecOut = binnedResidualsSec[sec];
auto& statVecOut = voxStatsSec[sec];
Expand Down
5 changes: 5 additions & 0 deletions Detectors/TPC/calibration/SpacePoints/src/ResidualAggregator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ void ResidualsContainer::fill(const o2::dataformats::TFIDInfo& ti, const gsl::sp
if (!writeBinnedResid) {
continue;
}
if (residIn.isTgSlpClamped()) {
// scdcalib.clampTgSlp: kept in the unbinned output, but its tgSlp is saturated and the voxel fit uses tgSlp (dX from
// dY vs tan(phi)), so it must not enter the binned residuals
continue;
}
int sec = residIn.sec;
auto& residVecOut = residuals[sec];
auto& statVecOut = stats[sec];
Expand Down
14 changes: 10 additions & 4 deletions Detectors/TPC/calibration/SpacePoints/src/TrackInterpolation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,11 @@ void TrackInterpolation::interpolateTrack(int iSeed)
const auto z = clusterResiduals[iCl].z;
const auto sec = clusterResiduals[iCl].sec;
const short flags = clusterResiduals[iCl].flags;
if ((std::abs(dy) < param::MaxResid) && (std::abs(dz) < param::MaxResid) && (std::abs(y) < param::MaxY) && (std::abs(z) < param::MaxZ) && (std::abs(tgPhi) < param::MaxTgSlp)) {
mClRes.emplace_back(dy, dz, tgPhi, y, z, iRow, sec, flags, rej);
// scdcalib.clampTgSlp: keep a cluster whose |tan(phi)| exceeds the packing range, with tgSlp saturated, instead of dropping it
const bool tgPhiOK = (std::abs(tgPhi) < param::MaxTgSlp) || mParams->clampTgSlp;
const float tgPhiStore = std::clamp(tgPhi, -param::MaxTgSlp, param::MaxTgSlp);
if ((std::abs(dy) < param::MaxResid) && (std::abs(dz) < param::MaxResid) && (std::abs(y) < param::MaxY) && (std::abs(z) < param::MaxZ) && tgPhiOK) {
mClRes.emplace_back(dy, dz, tgPhiStore, y, z, iRow, sec, flags, rej);
mDetInfoRes.emplace_back().setTPC(mCacheDEDX[iRow].first, mCacheDEDX[iRow].second); // qtot, qmax
++nClValidated;
} else {
Expand Down Expand Up @@ -1076,8 +1079,11 @@ void TrackInterpolation::extrapolateTrack(int iSeed)
const auto y = clusterResiduals[iCl].y;
const auto z = clusterResiduals[iCl].z;
const short flags = clusterResiduals[iCl].flags;
if ((std::abs(dy) < param::MaxResid) && (std::abs(dz) < param::MaxResid) && (std::abs(y) < param::MaxY) && (std::abs(z) < param::MaxZ) && (std::abs(tgPhi) < param::MaxTgSlp)) {
mClRes.emplace_back(dy, dz, tgPhi, y, z, iRow, clusterResiduals[iCl].sec, flags, rej);
// scdcalib.clampTgSlp: keep a cluster whose |tan(phi)| exceeds the packing range, with tgSlp saturated, instead of dropping it
const bool tgPhiOK = (std::abs(tgPhi) < param::MaxTgSlp) || mParams->clampTgSlp;
const float tgPhiStore = std::clamp(tgPhi, -param::MaxTgSlp, param::MaxTgSlp);
if ((std::abs(dy) < param::MaxResid) && (std::abs(dz) < param::MaxResid) && (std::abs(y) < param::MaxY) && (std::abs(z) < param::MaxZ) && tgPhiOK) {
mClRes.emplace_back(dy, dz, tgPhiStore, y, z, iRow, clusterResiduals[iCl].sec, flags, rej);
mDetInfoRes.emplace_back().setTPC(mCacheDEDX[iRow].first, mCacheDEDX[iRow].second); // qtot, qmax
++nClValidated;
} else {
Expand Down
Loading