Skip to content

Fix TRD pile-up information #11924

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

Merged
martenole merged 2 commits into from
Sep 21, 2023
Merged

Fix TRD pile-up information #11924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67dcae4
Fix TRD pile-up and PH information
martenole Sep 20, 2023
cede2f1
Fix digit comparison independently of sorting order
martenole Sep 21, 2023
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
2 changes: 1 addition & 1 deletion DataFormats/Detectors/TRD/include/DataFormatsTRD/CalT0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class CalT0
std::array<float, constants::MAXCHAMBER> mT0{}; ///< calibrated T0 per TRD chamber
float mT0av{-1}; ///< average T0 obtained from fitting the PH data from all chambers combined

ClassDefNV(CalT0, 1);
ClassDefNV(CalT0, 2);
};

} // namespace trd
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Detectors/TRD/src/Tracklet64.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace trd
void Tracklet64::print() const
{
LOGF(info, "%02i_%i_%i, ROB(%i), MCM(%i), row(%i), col(%i), position(%i), slope(%i), pid(%i), q0(%i), q1(%i), q2(%i). Format(%i)",
HelperMethods::getSector(getDetector()), HelperMethods::getStack(getDetector()), HelperMethods::getLayer(getDetector()), getROB(), getMCM(), getPadRow(), getColumn(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2(), getFormat());
HelperMethods::getSector(getDetector()), HelperMethods::getStack(getDetector()), HelperMethods::getLayer(getDetector()), getROB(), getMCM(), getPadRow(), getPadCol(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2(), getFormat());
}

#ifndef GPUCA_GPUCODE_DEVICE
Expand Down
43 changes: 30 additions & 13 deletions Detectors/TRD/calibration/src/PulseHeight.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,19 @@ void PulseHeight::process()
const auto& trigTrack = (*trackTriggers)[iTrigTrack];
if (trigTrack.getBCData().differenceInBC(trig.getBCData()) > 0) {
// aborting, since track trigger is later than digit trigger";
LOGP(debug, "Aborting, track trigger is too late");
break;
}
if (trigTrack.getBCData() != trig.getBCData()) {
// skipping, since track trigger earlier than digit trigger";
LOGP(debug, "Skipping, track trigger is too late");
++lastTrkTrig[iTrackType];
continue;
}
if ((*tracks)[trigTrack.getFirstTrack()].hasPileUpInfo() && (*tracks)[trigTrack.getFirstTrack()].getPileUpTimeShiftMUS() < mParams.pileupCut) {
// rejecting triggers which are close to other collisions (avoid pile-up)
++lastTrkTrig[iTrackType];
LOGP(debug, "Rececting trigger due to pileup of {}", (*tracks)[trigTrack.getFirstTrack()].getPileUpTimeShiftMUS());
break;
}
for (int iTrk = trigTrack.getFirstTrack(); iTrk < trigTrack.getFirstTrack() + trigTrack.getNumberOfTracks(); iTrk++) {
Expand All @@ -125,47 +128,61 @@ void PulseHeight::process()
void PulseHeight::findDigitsForTracklet(const Tracklet64& trklt, const TriggerRecord& trig, int type)
{
auto trkltDet = trklt.getDetector();
for (int iDigit = trig.getFirstDigit() + 1; iDigit < trig.getFirstDigit() + trig.getNumberOfDigits() - 1; ++iDigit) {
int iDigitFirst = trig.getFirstDigit();
int iDigitLast = trig.getFirstDigit() + trig.getNumberOfDigits();
for (int iDigit = iDigitFirst + 1; iDigit < iDigitLast - 1; ++iDigit) {
const auto& digit = (*mDigits)[iDigit];
if (digit.isSharedDigit()) {
continue; // avoid double-counting of the same digit
}
if (digit.getDetector() != trkltDet || digit.getPadRow() != trklt.getPadRow() || digit.getPadCol() != trklt.getPadCol()) {
// for now we loose charge information from padrow-crossing tracklets (~15% of all tracklets)
continue;
}
int nNeighbours = 0;
bool left = false;
bool right = false;
const auto& digitLeft = (*mDigits)[iDigit - 1];
const auto& digitRight = (*mDigits)[iDigit + 1];
const auto* digitLeft = &(*mDigits)[iDigit + 1];
const auto* digitRight = &(*mDigits)[iDigit - 1];
// due to shared digits the neighbouring element might still be in the same pad column
if (digitLeft->getPadCol() == digit.getPadCol() && iDigit < iDigitLast - 2) {
digitLeft = &(*mDigits)[iDigit + 2];
}
if (digitRight->getPadCol() == digit.getPadCol() && iDigit > iDigitFirst + 2) {
digitRight = &(*mDigits)[iDigit - 2];
}
LOG(debug) << "Central digit: " << digit;
LOG(debug) << "Left digit: " << digitLeft;
LOG(debug) << "Right digit: " << digitRight;
if (digitLeft.isNeighbour(digit) && digitLeft.getChannel() < digit.getChannel()) {
LOG(debug) << "Left digit: " << *digitLeft;
LOG(debug) << "Right digit: " << *digitRight;
int direction = 0;
if (digitLeft->isNeighbour(digit)) {
++nNeighbours;
left = true;
direction = digit.getPadCol() - digitLeft->getPadCol();
}
if (digitRight.isNeighbour(digit) && digitRight.getChannel() > digit.getChannel()) {
if (digitRight->isNeighbour(digit) && digit.getPadCol() - digitRight->getPadCol() != direction) {
++nNeighbours;
right = true;
}
if (nNeighbours > 0) {
int digitTrackletDistance = 0;
auto adcSumMax = digit.getADCsum();
if (left && digitLeft.getADCsum() > adcSumMax) {
adcSumMax = digitLeft.getADCsum();
if (left && digitLeft->getADCsum() > adcSumMax) {
adcSumMax = digitLeft->getADCsum();
digitTrackletDistance = 1;
}
if (right && digitRight.getADCsum() > adcSumMax) {
adcSumMax = digitRight.getADCsum();
if (right && digitRight->getADCsum() > adcSumMax) {
adcSumMax = digitRight->getADCsum();
digitTrackletDistance = -1;
}
mDistances.push_back(digitTrackletDistance);
for (int iTb = 0; iTb < TIMEBINS; ++iTb) {
uint16_t phVal = digit.getADC()[iTb];
if (left) {
phVal += digitLeft.getADC()[iTb];
phVal += digitLeft->getADC()[iTb];
}
if (right) {
phVal += digitRight.getADC()[iTb];
phVal += digitRight->getADC()[iTb];
}
mPHValues.emplace_back(phVal, trkltDet, iTb, nNeighbours, type);
}
Expand Down
7 changes: 4 additions & 3 deletions GPU/GPUTracking/DataTypes/GPUTRDInterfaceO2Track.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@ class trackInterface<o2::track::TrackParCov> : public o2::track::TrackParCov

GPUdi() void setPileUpDistance(unsigned char bwd, unsigned char fwd) { setUserField((((unsigned short)bwd) << 8) | fwd); }
GPUdi() bool hasPileUpInfo() const { return getUserField() != 0; }
GPUdi() unsigned char getPileUpDistanceBwd() const { return ((unsigned char)getUserField()) >> 8; }

@martenole martenole Sep 20, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok and there was another bug here which always returned zero for getPileUpDistanceBwd(), because by casting the 16 unsigned int to an unsigned char the information was always cut away

GPUdi() unsigned char getPileUpDistanceFwd() const { return ((unsigned char)getUserField()) & 255; }
GPUdi() bool hasPileUpInfoBothSides() const { return getPileUpDistanceBwd() > 0 && getPileUpDistanceFwd() > 0; }
GPUdi() unsigned char getPileUpDistanceBwd() const { return getUserField() >> 8; }
GPUdi() unsigned char getPileUpDistanceFwd() const { return getUserField() & 255; }
GPUdi() unsigned short getPileUpSpan() const { return ((unsigned short)getPileUpDistanceBwd()) + getPileUpDistanceFwd(); }
GPUdi() float getPileUpMean() const { return 0.5 * ((float)getPileUpDistanceFwd()) - ((float)getPileUpDistanceBwd()); }
GPUdi() float getPileUpMean() const { return hasPileUpInfoBothSides() ? 0.5 * (getPileUpDistanceFwd() + getPileUpDistanceBwd()) : getPileUpDistanceFwd() + getPileUpDistanceBwd(); }
GPUdi() float getPileUpTimeShiftMUS() const { return getPileUpMean() * o2::constants::lhc::LHCBunchSpacingMUS; }
GPUdi() float getPileUpTimeErrorMUS() const { return getPileUpSpan() * o2::constants::lhc::LHCBunchSpacingMUS / 3.4641016; }

Expand Down