Skip to content

Commit ff118eb

Browse files
f3schf3sch
committed
TRD: add optional(default=off) extra table for PID studies
Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>
1 parent 5a7fba3 commit ff118eb

File tree

4 files changed

+159
-20
lines changed

4 files changed

+159
-20
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include "DataFormatsGlobalTracking/RecoContainer.h"
2020
#include "DataFormatsPHOS/Cell.h"
2121
#include "DataFormatsTRD/TrackTRD.h"
22+
#include "TRDBase/PadCalibrationsAliases.h"
23+
#include "DataFormatsTRD/NoiseCalibration.h"
2224
#include "DetectorsBase/GRPGeomHelper.h"
2325
#include "DetectorsBase/Propagator.h"
2426
#include "Framework/DataProcessorSpec.h"
@@ -215,7 +217,7 @@ enum struct AODProducerStreamerFlags : uint8_t {
215217
class AODProducerWorkflowDPL : public Task
216218
{
217219
public:
218-
AODProducerWorkflowDPL(GID::mask_t src, std::shared_ptr<DataRequest> dataRequest, std::shared_ptr<o2::base::GRPGeomRequest> gr, bool enableSV, bool useMC = true, bool enableFITextra = false) : mUseMC(useMC), mEnableSV(enableSV), mEnableFITextra(enableFITextra), mInputSources(src), mDataRequest(dataRequest), mGGCCDBRequest(gr) {}
220+
AODProducerWorkflowDPL(GID::mask_t src, std::shared_ptr<DataRequest> dataRequest, std::shared_ptr<o2::base::GRPGeomRequest> gr, bool enableSV, bool useMC = true, bool enableFITextra = false, bool enableTRDextra = false) : mUseMC(useMC), mEnableSV(enableSV), mEnableFITextra(enableFITextra), mEnableTRDextra(enableTRDextra), mInputSources(src), mDataRequest(dataRequest), mGGCCDBRequest(gr) {}
219221
~AODProducerWorkflowDPL() override = default;
220222
void init(InitContext& ic) final;
221223
void run(ProcessingContext& pc) final;
@@ -245,6 +247,9 @@ class AODProducerWorkflowDPL : public Task
245247
o2::dataformats::MeanVertexObject mVtx;
246248
float mMinPropR{o2::constants::geom::XTPCInnerRef + 0.1f};
247249

250+
const o2::trd::LocalGainFactor* mTRDLocalGain; // TRD local gain factors from krypton calibration
251+
const o2::trd::NoiseStatusMCM* mTRDNoiseMap; // TRD noise map
252+
248253
std::unordered_set<GIndex> mGIDUsedBySVtx;
249254
std::unordered_set<GIndex> mGIDUsedByStr;
250255

@@ -255,6 +260,7 @@ class AODProducerWorkflowDPL : public Task
255260
bool mUseMC = true;
256261
bool mEnableSV = true; // enable secondary vertices
257262
bool mEnableFITextra = false;
263+
bool mEnableTRDextra = false;
258264
bool mFieldON = false;
259265
const float cSpeed = 0.029979246f; // speed of light in TOF units
260266

@@ -517,6 +523,9 @@ class AODProducerWorkflowDPL : public Task
517523
template <typename TracksQACursorType>
518524
void addToTracksQATable(TracksQACursorType& tracksQACursor, TrackQA& trackQAInfoHolder);
519525

526+
template <typename TRDsExtraCursorType>
527+
void addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx);
528+
520529
template <typename mftTracksCursorType, typename AmbigMFTTracksCursorType>
521530
void addToMFTTracksTable(mftTracksCursorType& mftTracksCursor, AmbigMFTTracksCursorType& ambigMFTTracksCursor,
522531
GIndex trackID, const o2::globaltracking::RecoContainer& data, int collisionID,
@@ -536,7 +545,7 @@ class AODProducerWorkflowDPL : public Task
536545
// helper for track tables
537546
// * fills tables collision by collision
538547
// * interaction time is for TOF information
539-
template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename AmbigTracksCursorType,
548+
template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename TRDsExtraCursorType, typename AmbigTracksCursorType,
540549
typename MFTTracksCursorType, typename MFTTracksCovCursorType, typename AmbigMFTTracksCursorType,
541550
typename FwdTracksCursorType, typename FwdTracksCovCursorType, typename AmbigFwdTracksCursorType, typename FwdTrkClsCursorType>
542551
void fillTrackTablesPerCollision(int collisionID,
@@ -548,6 +557,7 @@ class AODProducerWorkflowDPL : public Task
548557
TracksCovCursorType& tracksCovCursor,
549558
TracksExtraCursorType& tracksExtraCursor,
550559
TracksQACursorType& tracksQACursor,
560+
TRDsExtraCursorType& trdsExtraCursor,
551561
AmbigTracksCursorType& ambigTracksCursor,
552562
MFTTracksCursorType& mftTracksCursor,
553563
MFTTracksCovCursorType& mftTracksCovCursor,
@@ -672,7 +682,7 @@ class AODProducerWorkflowDPL : public Task
672682
};
673683

674684
/// create a processor spec
675-
framework::DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableST, bool useMC, bool CTPConfigPerRun, bool enableFITextra);
685+
framework::DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableST, bool useMC, bool CTPConfigPerRun, bool enableFITextra, bool enableTRDextra);
676686

677687
// helper interface for calo cells to "befriend" emcal and phos cells
678688
class CellHelper

‎Detectors/AOD/src/AODProducerWorkflowSpec.cxx‎

Lines changed: 117 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "DataFormatsPHOS/TriggerRecord.h"
3434
#include "DataFormatsPHOS/EventHandler.h"
3535
#include "DataFormatsTPC/TrackTPC.h"
36-
#include "DataFormatsTRD/TriggerRecord.h"
3736
#include "DataFormatsZDC/BCRecData.h"
3837
#include "DataFormatsZDC/ZDCEnergy.h"
3938
#include "DataFormatsZDC/ZDCTDCData.h"
@@ -45,6 +44,9 @@
4544
#include "CommonDataFormat/InteractionRecord.h"
4645
#include "DataFormatsTRD/TrackTRD.h"
4746
#include "DataFormatsTRD/TrackTriggerRecord.h"
47+
#include "DataFormatsTRD/CalibratedTracklet.h"
48+
#include "DataFormatsTRD/TriggerRecord.h"
49+
#include "DataFormatsTRD/Tracklet64.h"
4850
#include "DataFormatsGlobalTracking/RecoContainer.h"
4951
#include "Framework/AnalysisDataModel.h"
5052
#include "Framework/ConfigParamRegistry.h"
@@ -387,6 +389,79 @@ void AODProducerWorkflowDPL::addToTracksQATable(TracksQACursorType& tracksQACurs
387389
trackQAInfoHolder.dTofdZ);
388390
}
389391

392+
template <typename TRDsExtraCursorType>
393+
void AODProducerWorkflowDPL::addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx)
394+
{
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};
398+
399+
auto contributorsGID = recoData.getSingleDetectorRefs(trkIdx);
400+
if (!contributorsGID[GIndex::Source::TRD].isIndexSet()) { // should be redunant
401+
return;
402+
}
403+
const auto& trk = recoData.getTrack<o2::trd::TrackTRD>(contributorsGID[GIndex::Source::TRD]);
404+
auto trkC = trk;
405+
const auto& trklets = recoData.getTRDTracklets();
406+
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;
411+
auto trkltId = trk.getTrackletIndex(iLay);
412+
if (trkltId < 0) {
413+
continue;
414+
}
415+
const auto& tracklet = trklets[trkltId];
416+
if (mTRDNoiseMap->isTrackletFromNoisyMCM(tracklet)) {
417+
continue;
418+
}
419+
// we need to propagate into TRD local system
420+
int trkltDet = tracklet.getDetector();
421+
int trkltSec = trkltDet / 30;
422+
if (trkltSec != o2::math_utils::angle2Sector(trkC.getAlpha())) {
423+
if (!trkC.rotate(o2::math_utils::sector2Angle(trkltSec))) {
424+
break;
425+
}
426+
}
427+
if (!o2::base::Propagator::Instance()->PropagateToXBxByBz(trkC, ctrklets[trkltId].getX(), o2::base::Propagator::MAX_SIN_PHI, o2::base::Propagator::MAX_STEP, mMatCorr)) {
428+
break;
429+
}
430+
431+
auto tphi = trkC.getSnp() / std::sqrt((1.f - trkC.getSnp()) * (1.f + trkC.getSnp()));
432+
auto trackletLength = std::sqrt(1.f + tphi * tphi + trkC.getTgl() * trkC.getTgl());
433+
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+
}
459+
}
460+
}
461+
462+
trdExtraCursor(trkTableIdx, q0s, q1s, q2s, q0sCor, q1sCor, q2sCor, ttgls, tphis);
463+
}
464+
390465
template <typename mftTracksCursorType, typename AmbigMFTTracksCursorType>
391466
void AODProducerWorkflowDPL::addToMFTTracksTable(mftTracksCursorType& mftTracksCursor, AmbigMFTTracksCursorType& ambigMFTTracksCursor,
392467
GIndex trackID, const o2::globaltracking::RecoContainer& data, int collisionID,
@@ -428,7 +503,7 @@ void AODProducerWorkflowDPL::addToMFTTracksTable(mftTracksCursorType& mftTracksC
428503
}
429504
}
430505

431-
template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename AmbigTracksCursorType,
506+
template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename TRDsExtraCursor, typename AmbigTracksCursorType,
432507
typename MFTTracksCursorType, typename MFTTracksCovCursorType, typename AmbigMFTTracksCursorType,
433508
typename FwdTracksCursorType, typename FwdTracksCovCursorType, typename AmbigFwdTracksCursorType, typename FwdTrkClsCursorType>
434509
void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
@@ -440,6 +515,7 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
440515
TracksCovCursorType& tracksCovCursor,
441516
TracksExtraCursorType& tracksExtraCursor,
442517
TracksQACursorType& tracksQACursor,
518+
TRDsExtraCursor& trdsExtraCursor,
443519
AmbigTracksCursorType& ambigTracksCursor,
444520
MFTTracksCursorType& mftTracksCursor,
445521
MFTTracksCovCursorType& mftTracksCovCursor,
@@ -538,6 +614,10 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
538614
}
539615
addToTracksExtraTable(tracksExtraCursor, extraInfoHolder);
540616

617+
if (mEnableTRDextra && trackIndex.includesDet(GIndex::Source::TRD)) {
618+
addToTRDsExtra(data, trdsExtraCursor, trackIndex, mTableTrID);
619+
}
620+
541621
// collecting table indices of barrel tracks for V0s table
542622
if (extraInfoHolder.bcSlice[0] >= 0 && collisionID < 0) {
543623
ambigTracksCursor(mTableTrID, extraInfoHolder.bcSlice);
@@ -1110,7 +1190,7 @@ void AODProducerWorkflowDPL::fillMCTrackLabelsTable(MCTrackLabelCursorType& mcTr
11101190
if (!needToStore(mGIDToTableID)) {
11111191
continue;
11121192
}
1113-
if (mcTruth.isValid()) { // if not set, -1 will be stored
1193+
if (mcTruth.isValid()) { // if not set, -1 will be stored
11141194
labelHolder.labelID = (mToStore[mcTruth.getSourceID()][mcTruth.getEventID()])[mcTruth.getTrackID()]; // defined by TPC if it contributes, otherwise: by ITS
11151195
if (mcTruth.isFake()) {
11161196
labelHolder.labelMask |= (0x1 << 15);
@@ -1832,11 +1912,8 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
18321912
auto trackedV0Cursor = createTableCursor<o2::aod::TrackedV0s>(pc);
18331913
auto tracked3BodyCurs = createTableCursor<o2::aod::Tracked3Bodys>(pc);
18341914
auto fddCursor = createTableCursor<o2::aod::FDDs>(pc);
1835-
auto fddExtraCursor = createTableCursor<o2::aod::FDDsExtra>(pc);
18361915
auto ft0Cursor = createTableCursor<o2::aod::FT0s>(pc);
1837-
auto ft0ExtraCursor = createTableCursor<o2::aod::FT0sExtra>(pc);
18381916
auto fv0aCursor = createTableCursor<o2::aod::FV0As>(pc);
1839-
auto fv0aExtraCursor = createTableCursor<o2::aod::FV0AsExtra>(pc);
18401917
auto fwdTracksCursor = createTableCursor<o2::aod::StoredFwdTracks>(pc);
18411918
auto fwdTracksCovCursor = createTableCursor<o2::aod::StoredFwdTracksCov>(pc);
18421919
auto fwdTrkClsCursor = createTableCursor<o2::aod::FwdTrkCls>(pc);
@@ -1857,6 +1934,19 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
18571934
auto cpvClustersCursor = createTableCursor<o2::aod::CPVClusters>(pc);
18581935
auto originCursor = createTableCursor<o2::aod::Origins>(pc);
18591936

1937+
/// Extra tables
1938+
o2::framework::Produces<o2::aod::FT0sExtra> ft0ExtraCursor;
1939+
o2::framework::Produces<o2::aod::FDDsExtra> fddExtraCursor;
1940+
o2::framework::Produces<o2::aod::FV0AsExtra> fv0aExtraCursor;
1941+
if (mEnableFITextra) {
1942+
ft0ExtraCursor = createTableCursor<o2::aod::FT0sExtra>(pc);
1943+
fddExtraCursor = createTableCursor<o2::aod::FDDsExtra>(pc);
1944+
fv0aExtraCursor = createTableCursor<o2::aod::FV0AsExtra>(pc);
1945+
}
1946+
o2::framework::Produces<o2::aod::TRDsExtra> trdExtraCursor;
1947+
if (mEnableTRDextra) {
1948+
trdExtraCursor = createTableCursor<o2::aod::TRDsExtra>(pc);
1949+
}
18601950
// Declare MC cursors type without adding the output for a table
18611951
o2::framework::Produces<o2::aod::McCollisionLabels> mcColLabelsCursor;
18621952
o2::framework::Produces<o2::aod::McCollisions> mcCollisionsCursor;
@@ -2199,7 +2289,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
21992289
// so that all unassigned tracks are stored in the beginning of the table together
22002290
auto& trackRef = primVer2TRefs.back(); // references to unassigned tracks are at the end
22012291
// fixme: interaction time is undefined for unassigned tracks (?)
2202-
fillTrackTablesPerCollision(-1, std::uint64_t(-1), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor,
2292+
fillTrackTablesPerCollision(-1, std::uint64_t(-1), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, trdExtraCursor,
22032293
ambigTracksCursor, mftTracksCursor, mftTracksCovCursor, ambigMFTTracksCursor,
22042294
fwdTracksCursor, fwdTracksCovCursor, ambigFwdTracksCursor, fwdTrkClsCursor, bcsMap);
22052295

@@ -2241,7 +2331,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
22412331

22422332
auto& trackRef = primVer2TRefs[collisionID];
22432333
// passing interaction time in [ps]
2244-
fillTrackTablesPerCollision(collisionID, globalBC, trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, ambigTracksCursor,
2334+
fillTrackTablesPerCollision(collisionID, globalBC, trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, trdExtraCursor, ambigTracksCursor,
22452335
mftTracksCursor, mftTracksCovCursor, ambigMFTTracksCursor,
22462336
fwdTracksCursor, fwdTracksCovCursor, ambigFwdTracksCursor, fwdTrkClsCursor, bcsMap);
22472337
collisionID++;
@@ -2892,6 +2982,11 @@ void AODProducerWorkflowDPL::updateTimeDependentParams(ProcessingContext& pc)
28922982
mFieldON = std::abs(o2::base::Propagator::Instance()->getNominalBz()) > 0.01;
28932983

28942984
pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
2985+
2986+
if (mEnableTRDextra) {
2987+
mTRDLocalGain = pc.inputs().get<o2::trd::LocalGainFactor*>("trdlocalgainfactors").get();
2988+
mTRDNoiseMap = pc.inputs().get<o2::trd::NoiseStatusMCM*>("trdnoisemap").get();
2989+
}
28952990
}
28962991
if (mPropTracks) {
28972992
pc.inputs().get<o2::dataformats::MeanVertexObject*>("meanvtx");
@@ -3103,7 +3198,7 @@ void AODProducerWorkflowDPL::endOfStream(EndOfStreamContext& /*ec*/)
31033198
mStreamer.reset();
31043199
}
31053200

3106-
DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableStrangenessTracking, bool useMC, bool CTPConfigPerRun, bool enableFITextra)
3201+
DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableStrangenessTracking, bool useMC, bool CTPConfigPerRun, bool enableFITextra, bool enableTRDextra)
31073202
{
31083203
auto dataRequest = std::make_shared<DataRequest>();
31093204
dataRequest->inputs.emplace_back("ctpconfig", "CTP", "CTPCONFIG", 0, Lifetime::Condition, ccdbParamSpec("CTP/Config/Config", CTPConfigPerRun));
@@ -3163,11 +3258,8 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
31633258
OutputForTable<Collisions>::spec(),
31643259
OutputForTable<Decay3Bodys>::spec(),
31653260
OutputForTable<FDDs>::spec(),
3166-
OutputForTable<FDDsExtra>::spec(),
31673261
OutputForTable<FT0s>::spec(),
3168-
OutputForTable<FT0sExtra>::spec(),
31693262
OutputForTable<FV0As>::spec(),
3170-
OutputForTable<FV0AsExtra>::spec(),
31713263
OutputForTable<StoredFwdTracks>::spec(),
31723264
OutputForTable<StoredFwdTracksCov>::spec(),
31733265
OutputForTable<StoredMFTTracks>::spec(),
@@ -3195,6 +3287,18 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
31953287
OutputSpec{"AMD", "AODMetadataKeys"},
31963288
OutputSpec{"AMD", "AODMetadataVals"}};
31973289

3290+
/// Extra tables
3291+
if (enableFITextra) {
3292+
outputs.insert(outputs.end(),
3293+
{OutputForTable<FDDsExtra>::spec(),
3294+
OutputForTable<FT0sExtra>::spec(),
3295+
OutputForTable<FV0AsExtra>::spec()});
3296+
}
3297+
if (enableTRDextra) {
3298+
outputs.push_back(OutputForTable<TRDsExtra>::spec());
3299+
dataRequest->inputs.emplace_back("trdlocalgainfactors", "TRD", "LOCALGAINFACTORS", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/LocalGainFactor"));
3300+
dataRequest->inputs.emplace_back("trdnoisemap", "TRD", "NOISEMAP", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/NoiseMapMCM"));
3301+
}
31983302
if (useMC) {
31993303
outputs.insert(outputs.end(),
32003304
{OutputForTable<McCollisions>::spec(),
@@ -3217,7 +3321,7 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
32173321
"aod-producer-workflow",
32183322
dataRequest->inputs,
32193323
outputs,
3220-
AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, ggRequest, enableSV, useMC, enableFITextra)},
3324+
AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, ggRequest, enableSV, useMC, enableFITextra, enableTRDextra)},
32213325
Options{
32223326
ConfigParamSpec{"run-number", VariantType::Int64, -1L, {"The run-number. If left default we try to get it from DPL header."}},
32233327
ConfigParamSpec{"aod-timeframe-id", VariantType::Int64, -1L, {"Set timeframe number"}},

0 commit comments

Comments
 (0)