Skip to content

Commit bcd0da5

Browse files
f3schf3sch
committed
AOD: protoype TRD signal and eProb encoding
Note to self: think about inverse-log encoding pid signal and give 8 more bits to dEdx. Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>
1 parent ac2bcf3 commit bcd0da5

File tree

4 files changed

+120
-44
lines changed

4 files changed

+120
-44
lines changed

‎Detectors/AOD/include/AODProducerWorkflow/AODProducerWorkflowSpec.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ class AODProducerWorkflowDPL : public Task
524524
void addToTracksQATable(TracksQACursorType& tracksQACursor, TrackQA& trackQAInfoHolder);
525525

526526
template <typename TRDsExtraCursorType>
527-
void addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx);
527+
void addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, TrackExtraInfo& extraInfo, int trkTableIdx);
528528

529529
template <typename mftTracksCursorType, typename AmbigMFTTracksCursorType>
530530
void addToMFTTracksTable(mftTracksCursorType& mftTracksCursor, AmbigMFTTracksCursorType& ambigMFTTracksCursor,

‎Detectors/AOD/src/AODProducerWorkflowSpec.cxx‎

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ void AODProducerWorkflowDPL::addToTracksExtraTable(TracksExtraCursorType& tracks
349349
truncateFloatFraction(extraInfoHolder.trdChi2, mTrackChi2),
350350
truncateFloatFraction(extraInfoHolder.tofChi2, mTrackChi2),
351351
truncateFloatFraction(extraInfoHolder.tpcSignal, mTrackSignal),
352-
truncateFloatFraction(extraInfoHolder.trdSignal, mTrackSignal),
352+
extraInfoHolder.trdSignal, // byte encoded value do not truncate
353353
truncateFloatFraction(extraInfoHolder.length, mTrackSignal),
354354
truncateFloatFraction(extraInfoHolder.tofExpMom, mTrack1Pt),
355355
truncateFloatFraction(extraInfoHolder.trackEtaEMCAL, mTrackPosEMCAL),
@@ -390,24 +390,24 @@ void AODProducerWorkflowDPL::addToTracksQATable(TracksQACursorType& tracksQACurs
390390
}
391391

392392
template <typename TRDsExtraCursorType>
393-
void AODProducerWorkflowDPL::addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx)
393+
void AODProducerWorkflowDPL::addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, TrackExtraInfo& extraInfo, int trkTableIdx)
394394
{
395-
static int q0s[6] = {-1}, q1s[6] = {-1}, q2s[6] = {-1};
396-
static float q0sCor[6] = {-1}, q1sCor[6] = {-1}, q2sCor[6] = {-1};
397-
static float ttgls[6] = {-999}, tphis[6] = {-999};
395+
const int NLAYERS = o2::trd::TrackTRD::EGPUTRDTrack::kNLayers;
396+
int q0s[NLAYERS] = {-1}, q1s[NLAYERS] = {-1}, q2s[NLAYERS] = {-1};
397+
float q0sCor[NLAYERS] = {-1}, q1sCor[NLAYERS] = {-1}, q2sCor[NLAYERS] = {-1};
398+
float ttgls[NLAYERS] = {-999}, tphis[NLAYERS] = {-999};
398399

399400
auto contributorsGID = recoData.getSingleDetectorRefs(trkIdx);
400401
if (!contributorsGID[GIndex::Source::TRD].isIndexSet()) { // should be redunant
401402
return;
402403
}
403404
const auto& trk = recoData.getTrack<o2::trd::TrackTRD>(contributorsGID[GIndex::Source::TRD]);
404-
auto trkC = trk;
405405
const auto& trklets = recoData.getTRDTracklets();
406406
const auto& ctrklets = recoData.getTRDCalibratedTracklets();
407-
for (int iLay{0}; iLay < 6; ++iLay) {
408-
q0s[iLay] = q1s[iLay] = q2s[iLay] = -1;
409-
q0sCor[iLay] = q1sCor[iLay] = q2sCor[iLay] = -1;
410-
tphis[iLay] = ttgls[iLay] = -999;
407+
auto trkC = trk; // local copy to propagate
408+
409+
float dEdx{0.};
410+
for (int iLay{0}; iLay < NLAYERS; ++iLay) {
411411
auto trkltId = trk.getTrackletIndex(iLay);
412412
if (trkltId < 0) {
413413
continue;
@@ -421,45 +421,39 @@ void AODProducerWorkflowDPL::addToTRDsExtra(const o2::globaltracking::RecoContai
421421
int trkltSec = trkltDet / 30;
422422
if (trkltSec != o2::math_utils::angle2Sector(trkC.getAlpha())) {
423423
if (!trkC.rotate(o2::math_utils::sector2Angle(trkltSec))) {
424-
break;
424+
continue;
425425
}
426426
}
427427
if (!o2::base::Propagator::Instance()->PropagateToXBxByBz(trkC, ctrklets[trkltId].getX(), o2::base::Propagator::MAX_SIN_PHI, o2::base::Propagator::MAX_STEP, mMatCorr)) {
428-
break;
428+
continue;
429429
}
430430

431431
auto tphi = trkC.getSnp() / std::sqrt((1.f - trkC.getSnp()) * (1.f + trkC.getSnp()));
432432
auto trackletLength = std::sqrt(1.f + tphi * tphi + trkC.getTgl() * trkC.getTgl());
433433
float cor = mTRDLocalGain->getValue(tracklet.getHCID() / 2, tracklet.getPadCol(), tracklet.getPadRow()) * trackletLength;
434-
q0s[iLay] = tracklet.getQ0();
435-
q1s[iLay] = tracklet.getQ1();
436-
q2s[iLay] = tracklet.getQ2();
437-
q0sCor[iLay] = (float)tracklet.getQ0() / cor;
438-
q1sCor[iLay] = (float)tracklet.getQ1() / cor;
439-
q2sCor[iLay] = (float)tracklet.getQ2() / cor;
440-
ttgls[iLay] = trkC.getTgl();
441-
tphis[iLay] = tphi;
442-
443-
// z-row merging
444-
if (trk.getIsCrossingNeighbor(iLay) && trk.getHasNeighbor()) {
445-
for (const auto& trklt : trklets) {
446-
if (tracklet.getTrackletWord() == trklt.getTrackletWord()) {
447-
continue;
448-
}
449-
if (std::abs(tracklet.getPadCol() - trklt.getPadCol()) <= 1 && std::abs(tracklet.getPadRow() - trklt.getPadRow()) == 1) {
450-
cor = mTRDLocalGain->getValue(trklt.getHCID() / 2, trklt.getPadCol(), trklt.getPadRow()) * trackletLength;
451-
q0s[iLay] += trklt.getQ0();
452-
q1s[iLay] += trklt.getQ1();
453-
q2s[iLay] += trklt.getQ2();
454-
q0sCor[iLay] += (float)trklt.getQ0() / cor;
455-
q1sCor[iLay] += (float)trklt.getQ1() / cor;
456-
q2sCor[iLay] += (float)trklt.getQ2() / cor;
457-
}
458-
}
434+
if (mEnableTRDextra) {
435+
q0s[iLay] = tracklet.getQ0();
436+
q1s[iLay] = tracklet.getQ1();
437+
q2s[iLay] = tracklet.getQ2();
438+
q0sCor[iLay] = (float)tracklet.getQ0() / cor;
439+
q1sCor[iLay] = (float)tracklet.getQ1() / cor;
440+
q2sCor[iLay] = (float)tracklet.getQ2() / cor;
441+
ttgls[iLay] = trkC.getTgl();
442+
tphis[iLay] = tphi;
459443
}
444+
445+
dEdx += (float)tracklet.getQTot() / cor;
460446
}
447+
dEdx /= (float)trkC.getNtracklets();
448+
449+
aod::track::extensions::TRDSignalEncoding enc;
450+
enc.setDEdx(dEdx);
451+
enc.setEProb(trk.getSignal());
452+
extraInfo.trdSignal = enc.getSignal();
461453

462-
trdExtraCursor(trkTableIdx, q0s, q1s, q2s, q0sCor, q1sCor, q2sCor, ttgls, tphis);
454+
if (mEnableTRDextra) {
455+
trdExtraCursor(trkTableIdx, q0s, q1s, q2s, q0sCor, q1sCor, q2sCor, ttgls, tphis);
456+
}
463457
}
464458

465459
template <typename mftTracksCursorType, typename AmbigMFTTracksCursorType>
@@ -612,12 +606,13 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
612606
if (!isProp) {
613607
addToTracksTable(tracksCursor, tracksCovCursor, trOrig, collisionID, aod::track::TrackIU);
614608
}
615-
addToTracksExtraTable(tracksExtraCursor, extraInfoHolder);
616609

617-
if (mEnableTRDextra && trackIndex.includesDet(GIndex::Source::TRD)) {
618-
addToTRDsExtra(data, trdsExtraCursor, trackIndex, mTableTrID);
610+
if (trackIndex.includesDet(GIndex::Source::TRD)) {
611+
addToTRDsExtra(data, trdsExtraCursor, trackIndex, extraInfoHolder, mTableTrID);
619612
}
620613

614+
addToTracksExtraTable(tracksExtraCursor, extraInfoHolder);
615+
621616
// collecting table indices of barrel tracks for V0s table
622617
if (extraInfoHolder.bcSlice[0] >= 0 && collisionID < 0) {
623618
ambigTracksCursor(mTableTrID, extraInfoHolder.bcSlice);
@@ -2606,7 +2601,6 @@ AODProducerWorkflowDPL::TrackExtraInfo AODProducerWorkflowDPL::processBarrelTrac
26062601
if (contributorsGID[GIndex::Source::TRD].isIndexSet()) { // ITS-TPC-TRD-TOF, TPC-TRD-TOF, TPC-TRD, ITS-TPC-TRD
26072602
const auto& trdOrig = data.getTrack<o2::trd::TrackTRD>(contributorsGID[GIndex::Source::TRD]); // refitted TRD trac
26082603
extraInfoHolder.trdChi2 = trdOrig.getChi2();
2609-
extraInfoHolder.trdSignal = trdOrig.getSignal();
26102604
extraInfoHolder.trdPattern = getTRDPattern(trdOrig);
26112605
if (extraInfoHolder.trackTimeRes < 0.) { // time is not set yet, this is possible only for TPC-TRD and ITS-TPC-TRD tracks, since those with TOF are set upstream
26122606
// TRD is triggered: time uncertainty is within a BC

‎Framework/Core/include/Framework/AnalysisDataModel.h‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,23 @@ DECLARE_SOA_DYNAMIC_COLUMN(TPCDeltaTBwd, tpcDeltaTBwd, //! Delta Backward of tra
394394

395395
} // namespace v001
396396

397+
namespace v002::extensions
398+
{
399+
using TRDEncoding = o2::aod::track::extensions::TRDSignalEncoding;
400+
DECLARE_SOA_DYNAMIC_COLUMN(TRDDEdx, trdDEDx, //! TRD dEdx signal (a.u.), returns 0. if no valid signal is provided
401+
[](float signal) -> float {
402+
TRDEncoding enc;
403+
enc.setSignal(signal);
404+
return enc.getDEdx();
405+
});
406+
DECLARE_SOA_DYNAMIC_COLUMN(TRDEProb, trdEProb, //! TRD electron probability [0., 1.), returns 0. if no valid signal is provided
407+
[](float signal) -> float {
408+
TRDEncoding enc;
409+
enc.setSignal(signal);
410+
return enc.getDEdx();
411+
});
412+
} // namespace v002::extensions
413+
397414
DECLARE_SOA_DYNAMIC_COLUMN(HasITS, hasITS, //! Flag to check if track has a ITS match
398415
[](uint8_t detectorMap) -> bool { return detectorMap & o2::aod::track::ITS; });
399416
DECLARE_SOA_DYNAMIC_COLUMN(HasTPC, hasTPC, //! Flag to check if track has a TPC match
@@ -617,7 +634,9 @@ DECLARE_SOA_TABLE_FULL_VERSIONED(StoredTracksExtra_002, "TracksExtra", "AOD", "T
617634
track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusPID, track::TPCNClsFindableMinusCrossedRows,
618635
track::TPCNClsShared, track::v001::extensions::TPCDeltaTFwd<track::TrackTimeRes, track::Flags>, track::v001::extensions::TPCDeltaTBwd<track::TrackTimeRes, track::Flags>,
619636
track::TRDPattern, track::ITSChi2NCl, track::TPCChi2NCl, track::TRDChi2, track::TOFChi2,
620-
track::TPCSignal, track::TRDSignal, track::Length, track::TOFExpMom,
637+
track::TPCSignal,
638+
track::TRDSignal, track::v002::extensions::TRDDEdx<track::TRDSignal>, track::v002::extensions::TRDEProb<track::TRDSignal>,
639+
track::Length, track::TOFExpMom,
621640
track::PIDForTracking<track::Flags>,
622641
track::IsPVContributor<track::Flags>,
623642
track::HasITS<track::v001::DetectorMap>, track::HasTPC<track::v001::DetectorMap>,

‎Framework/Core/include/Framework/DataTypes.h‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ enum TRDTrackPattern : uint8_t {
7676
HasNeighbor = 0x40,
7777
HasCrossing = 0x80,
7878
};
79+
7980
namespace extensions
8081
{
8182
struct TPCTimeErrEncoding {
@@ -121,6 +122,68 @@ struct TPCTimeErrEncoding {
121122
return static_cast<float>(encoding.deltas.timeBackward) / timeScaler * TPCBinNS;
122123
}
123124
};
125+
126+
class TRDSignalEncoding
127+
{
128+
union {
129+
float signal{0};
130+
struct {
131+
uint16_t dEdx{0}; // range [0., 512.)
132+
uint16_t eProb{0}; // range [0., 1.)
133+
} __attribute((packed)) data;
134+
} encoding{0};
135+
static_assert(sizeof(float) == 2 * sizeof(uint16_t));
136+
137+
public:
138+
static constexpr float dEdxMax{512.f};
139+
static constexpr float dEdxScaler{(1 << 16) / dEdxMax};
140+
static constexpr float eProbMax{1.f};
141+
static constexpr float eProbScaler{(1 << 16) / eProbMax};
142+
143+
void setSignal(float signal)
144+
{
145+
if (signal == -1. || signal == -999.f) {
146+
// these two signal produce valid looking values
147+
// but for backward comp. and not to confuse we mask these two specifically
148+
encoding.signal = 0.;
149+
} else {
150+
encoding.signal = signal;
151+
}
152+
}
153+
154+
void setDEdx(float v)
155+
{
156+
if (v >= 0. && v < dEdxMax) {
157+
encoding.data.dEdx = static_cast<uint16_t>(v * dEdxScaler);
158+
} else {
159+
encoding.data.dEdx = 0.f;
160+
}
161+
}
162+
void setEProb(float v)
163+
{
164+
if (v >= 0. && v < eProbMax) {
165+
encoding.data.eProb = static_cast<uint16_t>(v * eProbScaler);
166+
} else {
167+
encoding.data.eProb = 0.f;
168+
}
169+
}
170+
171+
float getSignal() const noexcept
172+
{
173+
return encoding.signal;
174+
}
175+
176+
float getDEdx() const noexcept
177+
{
178+
return static_cast<float>(encoding.data.dEdx) / dEdxScaler;
179+
}
180+
181+
float getEProb() const noexcept
182+
{
183+
return static_cast<float>(encoding.data.eProb) / eProbScaler;
184+
}
185+
};
186+
124187
} // namespace extensions
125188

126189
// Reference radius for extrapolated tracks

0 commit comments

Comments
 (0)