Skip to content

TRD PID Study #14683

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

Closed
KangkanGoswami wants to merge 14 commits into from
Closed

TRD PID Study #14683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
436f7ba
Update AODProducerWorkflowSpec.h
KangkanGoswami Sep 22, 2025
a0c279e
Update AODProducerWorkflowSpec.cxx
KangkanGoswami Sep 22, 2025
bb88915
Update aod-producer-workflow.cxx
KangkanGoswami Sep 22, 2025
4daaea6
Update AnalysisDataModel.h
KangkanGoswami Sep 22, 2025
8a02b3c
Please consider the following formatting changes
alibuild Sep 22, 2025
47a07e7
Merge pull request #1 from alibuild/alibot-cleanup-14683
KangkanGoswami Sep 24, 2025
3c22da5
Update AODProducerWorkflowSpec.cxx
KangkanGoswami Sep 26, 2025
e3f894f
Update AODProducerWorkflowSpec.cxx
KangkanGoswami Sep 26, 2025
5c4d5fd
Please consider the following formatting changes
alibuild Sep 26, 2025
ec02d28
Merge pull request #2 from alibuild/alibot-cleanup-14683
KangkanGoswami Sep 26, 2025
60a329b
Merge branch 'AliceO2Group:dev' into dev
KangkanGoswami Sep 27, 2025
111e983
Merge branch 'AliceO2Group:dev' into dev
KangkanGoswami Sep 30, 2025
5734b33
Merge branch 'AliceO2Group:dev' into dev
KangkanGoswami Oct 10, 2025
30eb310
Merge branch 'AliceO2Group:dev' into dev
KangkanGoswami Oct 14, 2025
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
16 changes: 13 additions & 3 deletions Detectors/AOD/include/AODProducerWorkflow/AODProducerWorkflowSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include "DataFormatsGlobalTracking/RecoContainer.h"
#include "DataFormatsPHOS/Cell.h"
#include "DataFormatsTRD/TrackTRD.h"
#include "TRDBase/PadCalibrationsAliases.h"
#include "DataFormatsTRD/NoiseCalibration.h"
#include "DetectorsBase/GRPGeomHelper.h"
#include "DetectorsBase/Propagator.h"
#include "Framework/DataProcessorSpec.h"
Expand Down Expand Up @@ -215,7 +217,7 @@ enum struct AODProducerStreamerFlags : uint8_t {
class AODProducerWorkflowDPL : public Task
{
public:
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) {}
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) {}
~AODProducerWorkflowDPL() override = default;
void init(InitContext& ic) final;
void run(ProcessingContext& pc) final;
Expand Down Expand Up @@ -248,6 +250,9 @@ class AODProducerWorkflowDPL : public Task
o2::dataformats::MeanVertexObject mVtx;
float mMaxPropXiu{5.0f}; // max X_IU for which track is to be propagated if mPropTracks is true. (other option: o2::constants::geom::XTPCInnerRef + 0.1f)

const o2::trd::LocalGainFactor* mTRDLocalGain; // TRD local gain factors from krypton calibration
const o2::trd::NoiseStatusMCM* mTRDNoiseMap; // TRD noise map

std::unordered_set<GIndex> mGIDUsedBySVtx;
std::unordered_set<GIndex> mGIDUsedByStr;

Expand All @@ -259,6 +264,7 @@ class AODProducerWorkflowDPL : public Task
bool mUseSigFiltMC = false; // enable signal filtering for MC with embedding
bool mEnableSV = true; // enable secondary vertices
bool mEnableFITextra = false;
bool mEnableTRDextra = false;
bool mFieldON = false;
const float cSpeed = 0.029979246f; // speed of light in TOF units

Expand Down Expand Up @@ -523,6 +529,9 @@ class AODProducerWorkflowDPL : public Task
template <typename TracksQACursorType>
void addToTracksQATable(TracksQACursorType& tracksQACursor, TrackQA& trackQAInfoHolder);

template <typename TRDsExtraCursorType>
void addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx);

template <typename mftTracksCursorType, typename AmbigMFTTracksCursorType>
void addToMFTTracksTable(mftTracksCursorType& mftTracksCursor, AmbigMFTTracksCursorType& ambigMFTTracksCursor,
GIndex trackID, const o2::globaltracking::RecoContainer& data, int collisionID,
Expand All @@ -542,7 +551,7 @@ class AODProducerWorkflowDPL : public Task
// helper for track tables
// * fills tables collision by collision
// * interaction time is for TOF information
template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename AmbigTracksCursorType,
template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename TRDsExtraCursorType, typename AmbigTracksCursorType,
typename MFTTracksCursorType, typename MFTTracksCovCursorType, typename AmbigMFTTracksCursorType,
typename FwdTracksCursorType, typename FwdTracksCovCursorType, typename AmbigFwdTracksCursorType, typename FwdTrkClsCursorType>
void fillTrackTablesPerCollision(int collisionID,
Expand All @@ -554,6 +563,7 @@ class AODProducerWorkflowDPL : public Task
TracksCovCursorType& tracksCovCursor,
TracksExtraCursorType& tracksExtraCursor,
TracksQACursorType& tracksQACursor,
TRDsExtraCursorType& trdsExtraCursor,
AmbigTracksCursorType& ambigTracksCursor,
MFTTracksCursorType& mftTracksCursor,
MFTTracksCovCursorType& mftTracksCovCursor,
Expand Down Expand Up @@ -678,7 +688,7 @@ class AODProducerWorkflowDPL : public Task
};

/// create a processor spec
framework::DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableST, bool useMC, bool CTPConfigPerRun, bool enableFITextra);
framework::DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableST, bool useMC, bool CTPConfigPerRun, bool enableFITextra, bool enableTRDextra);

// helper interface for calo cells to "befriend" emcal and phos cells
class CellHelper
Expand Down
127 changes: 116 additions & 11 deletions Detectors/AOD/src/AODProducerWorkflowSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "DataFormatsPHOS/TriggerRecord.h"
#include "DataFormatsPHOS/EventHandler.h"
#include "DataFormatsTPC/TrackTPC.h"
#include "DataFormatsTRD/TriggerRecord.h"
#include "DataFormatsZDC/BCRecData.h"
#include "DataFormatsZDC/ZDCEnergy.h"
#include "DataFormatsZDC/ZDCTDCData.h"
Expand All @@ -45,6 +44,9 @@
#include "CommonDataFormat/InteractionRecord.h"
#include "DataFormatsTRD/TrackTRD.h"
#include "DataFormatsTRD/TrackTriggerRecord.h"
#include "DataFormatsTRD/CalibratedTracklet.h"
#include "DataFormatsTRD/TriggerRecord.h"
#include "DataFormatsTRD/Tracklet64.h"
#include "DataFormatsGlobalTracking/RecoContainer.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ConfigParamRegistry.h"
Expand Down Expand Up @@ -390,6 +392,79 @@ void AODProducerWorkflowDPL::addToTracksQATable(TracksQACursorType& tracksQACurs
trackQAInfoHolder.dTofdZ);
}

template <typename TRDsExtraCursorType>
void AODProducerWorkflowDPL::addToTRDsExtra(const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx)
{
static int q0s[6] = {-1}, q1s[6] = {-1}, q2s[6] = {-1};
Copy link
Collaborator

@sawenzel sawenzel Sep 26, 2025

Choose a reason for hiding this comment

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

This is a lot of new detector specific code. Could this not be done in TRD reco for better logic isolation? Also, I would be interested to know the CPU impact on the overall AOD processing.

static float q0sCor[6] = {-1}, q1sCor[6] = {-1}, q2sCor[6] = {-1};
static float ttgls[6] = {-999}, tphis[6] = {-999};

auto contributorsGID = recoData.getSingleDetectorRefs(trkIdx);
if (!contributorsGID[GIndex::Source::TRD].isIndexSet()) { // should be redunant
return;
}
const auto& trk = recoData.getTrack<o2::trd::TrackTRD>(contributorsGID[GIndex::Source::TRD]);
auto trkC = trk;
const auto& trklets = recoData.getTRDTracklets();
const auto& ctrklets = recoData.getTRDCalibratedTracklets();
for (int iLay{0}; iLay < 6; ++iLay) {
q0s[iLay] = q1s[iLay] = q2s[iLay] = -1;
q0sCor[iLay] = q1sCor[iLay] = q2sCor[iLay] = -1;
tphis[iLay] = ttgls[iLay] = -999;
auto trkltId = trk.getTrackletIndex(iLay);
if (trkltId < 0) {
continue;
}
const auto& tracklet = trklets[trkltId];
if (mTRDNoiseMap->isTrackletFromNoisyMCM(tracklet)) {
continue;
}
// we need to propagate into TRD local system
int trkltDet = tracklet.getDetector();
int trkltSec = trkltDet / 30;
if (trkltSec != o2::math_utils::angle2Sector(trkC.getAlpha())) {
if (!trkC.rotate(o2::math_utils::sector2Angle(trkltSec))) {
break;
}
}
if (!o2::base::Propagator::Instance()->PropagateToXBxByBz(trkC, ctrklets[trkltId].getX(), o2::base::Propagator::MAX_SIN_PHI, o2::base::Propagator::MAX_STEP, mMatCorr)) {
break;
}

auto tphi = trkC.getSnp() / std::sqrt((1.f - trkC.getSnp()) * (1.f + trkC.getSnp()));
auto trackletLength = std::sqrt(1.f + tphi * tphi + trkC.getTgl() * trkC.getTgl());
float cor = mTRDLocalGain->getValue(tracklet.getHCID() / 2, tracklet.getPadCol(), tracklet.getPadRow()) * trackletLength;
q0s[iLay] = tracklet.getQ0();
q1s[iLay] = tracklet.getQ1();
q2s[iLay] = tracklet.getQ2();
q0sCor[iLay] = (float)tracklet.getQ0() / cor;
q1sCor[iLay] = (float)tracklet.getQ1() / cor;
q2sCor[iLay] = (float)tracklet.getQ2() / cor;
ttgls[iLay] = trkC.getTgl();
tphis[iLay] = tphi;

// z-row merging
if (trk.getIsCrossingNeighbor(iLay) && trk.getHasNeighbor()) {
for (const auto& trklt : trklets) {
if (tracklet.getTrackletWord() == trklt.getTrackletWord()) {
continue;
}
if (std::abs(tracklet.getPadCol() - trklt.getPadCol()) <= 1 && std::abs(tracklet.getPadRow() - trklt.getPadRow()) == 1) {
cor = mTRDLocalGain->getValue(trklt.getHCID() / 2, trklt.getPadCol(), trklt.getPadRow()) * trackletLength;
q0s[iLay] += trklt.getQ0();
q1s[iLay] += trklt.getQ1();
q2s[iLay] += trklt.getQ2();
q0sCor[iLay] += (float)trklt.getQ0() / cor;
q1sCor[iLay] += (float)trklt.getQ1() / cor;
q2sCor[iLay] += (float)trklt.getQ2() / cor;
}
}
}
}

trdExtraCursor(trkTableIdx, q0s, q1s, q2s, q0sCor, q1sCor, q2sCor, ttgls, tphis);
}

template <typename mftTracksCursorType, typename AmbigMFTTracksCursorType>
void AODProducerWorkflowDPL::addToMFTTracksTable(mftTracksCursorType& mftTracksCursor, AmbigMFTTracksCursorType& ambigMFTTracksCursor,
GIndex trackID, const o2::globaltracking::RecoContainer& data, int collisionID,
Expand Down Expand Up @@ -430,8 +505,7 @@ void AODProducerWorkflowDPL::addToMFTTracksTable(mftTracksCursorType& mftTracksC
ambigMFTTracksCursor(mTableTrMFTID, bcSlice);
}
}

template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename AmbigTracksCursorType,
template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename TRDsExtraCursor, typename AmbigTracksCursorType,
typename MFTTracksCursorType, typename MFTTracksCovCursorType, typename AmbigMFTTracksCursorType,
typename FwdTracksCursorType, typename FwdTracksCovCursorType, typename AmbigFwdTracksCursorType, typename FwdTrkClsCursorType>
void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
Expand All @@ -443,6 +517,7 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
TracksCovCursorType& tracksCovCursor,
TracksExtraCursorType& tracksExtraCursor,
TracksQACursorType& tracksQACursor,
TRDsExtraCursor& trdsExtraCursor,
AmbigTracksCursorType& ambigTracksCursor,
MFTTracksCursorType& mftTracksCursor,
MFTTracksCovCursorType& mftTracksCovCursor,
Expand Down Expand Up @@ -553,7 +628,9 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
addToTracksTable(tracksCursor, tracksCovCursor, trOrig, collisionID, aod::track::TrackIU);
}
addToTracksExtraTable(tracksExtraCursor, extraInfoHolder);

if (mEnableTRDextra && trackIndex.includesDet(GIndex::Source::TRD)) {
addToTRDsExtra(data, trdsExtraCursor, trackIndex, mTableTrID);
}
// collecting table indices of barrel tracks for V0s table
if (extraInfoHolder.bcSlice[0] >= 0 && collisionID < 0) {
ambigTracksCursor(mTableTrID, extraInfoHolder.bcSlice);
Expand Down Expand Up @@ -1906,11 +1983,8 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
auto trackedV0Cursor = createTableCursor<o2::aod::TrackedV0s>(pc);
auto tracked3BodyCurs = createTableCursor<o2::aod::Tracked3Bodys>(pc);
auto fddCursor = createTableCursor<o2::aod::FDDs>(pc);
auto fddExtraCursor = createTableCursor<o2::aod::FDDsExtra>(pc);
auto ft0Cursor = createTableCursor<o2::aod::FT0s>(pc);
auto ft0ExtraCursor = createTableCursor<o2::aod::FT0sExtra>(pc);
auto fv0aCursor = createTableCursor<o2::aod::FV0As>(pc);
auto fv0aExtraCursor = createTableCursor<o2::aod::FV0AsExtra>(pc);
auto fwdTracksCursor = createTableCursor<o2::aod::StoredFwdTracks>(pc);
auto fwdTracksCovCursor = createTableCursor<o2::aod::StoredFwdTracksCov>(pc);
auto fwdTrkClsCursor = createTableCursor<o2::aod::FwdTrkCls>(pc);
Expand All @@ -1931,6 +2005,21 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
auto cpvClustersCursor = createTableCursor<o2::aod::CPVClusters>(pc);
auto originCursor = createTableCursor<o2::aod::Origins>(pc);

/// Extra tables
o2::framework::Produces<o2::aod::FT0sExtra> ft0ExtraCursor;
o2::framework::Produces<o2::aod::FDDsExtra> fddExtraCursor;
o2::framework::Produces<o2::aod::FV0AsExtra> fv0aExtraCursor;

if (mEnableFITextra) {
ft0ExtraCursor = createTableCursor<o2::aod::FT0sExtra>(pc);
fddExtraCursor = createTableCursor<o2::aod::FDDsExtra>(pc);
fv0aExtraCursor = createTableCursor<o2::aod::FV0AsExtra>(pc);
}
o2::framework::Produces<o2::aod::TRDsExtra> trdExtraCursor;
if (mEnableTRDextra) {
trdExtraCursor = createTableCursor<o2::aod::TRDsExtra>(pc);
}

// Declare MC cursors type without adding the output for a table
o2::framework::Produces<o2::aod::McCollisionLabels> mcColLabelsCursor;
o2::framework::Produces<o2::aod::McCollisions> mcCollisionsCursor;
Expand Down Expand Up @@ -2297,7 +2386,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
// so that all unassigned tracks are stored in the beginning of the table together
auto& trackRef = primVer2TRefs.back(); // references to unassigned tracks are at the end
// fixme: interaction time is undefined for unassigned tracks (?)
fillTrackTablesPerCollision(-1, std::uint64_t(-1), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor,
fillTrackTablesPerCollision(-1, std::uint64_t(-1), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, trdExtraCursor,
ambigTracksCursor, mftTracksCursor, mftTracksCovCursor, ambigMFTTracksCursor,
fwdTracksCursor, fwdTracksCovCursor, ambigFwdTracksCursor, fwdTrkClsCursor, bcsMap);

Expand Down Expand Up @@ -2339,7 +2428,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)

auto& trackRef = primVer2TRefs[collisionID];
// passing interaction time in [ps]
fillTrackTablesPerCollision(collisionID, globalBC, trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, ambigTracksCursor,
fillTrackTablesPerCollision(collisionID, globalBC, trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, trdExtraCursor, ambigTracksCursor,
mftTracksCursor, mftTracksCovCursor, ambigMFTTracksCursor,
fwdTracksCursor, fwdTracksCovCursor, ambigFwdTracksCursor, fwdTrkClsCursor, bcsMap);
collisionID++;
Expand Down Expand Up @@ -3004,6 +3093,10 @@ void AODProducerWorkflowDPL::updateTimeDependentParams(ProcessingContext& pc)
mFieldON = std::abs(o2::base::Propagator::Instance()->getNominalBz()) > 0.01;

pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
if (mEnableTRDextra) {
mTRDLocalGain = pc.inputs().get<o2::trd::LocalGainFactor*>("trdlocalgainfactors").get();
mTRDNoiseMap = pc.inputs().get<o2::trd::NoiseStatusMCM*>("trdnoisemap").get();
}
}
if (mPropTracks) {
pc.inputs().get<o2::dataformats::MeanVertexObject*>("meanvtx");
Expand Down Expand Up @@ -3215,7 +3308,7 @@ void AODProducerWorkflowDPL::endOfStream(EndOfStreamContext& /*ec*/)
mStreamer.reset();
}

DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableStrangenessTracking, bool useMC, bool CTPConfigPerRun, bool enableFITextra)
DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, bool enableStrangenessTracking, bool useMC, bool CTPConfigPerRun, bool enableFITextra, bool enableTRDextra)
{
auto dataRequest = std::make_shared<DataRequest>();
dataRequest->inputs.emplace_back("ctpconfig", "CTP", "CTPCONFIG", 0, Lifetime::Condition, ccdbParamSpec("CTP/Config/Config", CTPConfigPerRun));
Expand Down Expand Up @@ -3306,6 +3399,18 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
OutputSpec{"TFF", "TFFilename"},
OutputSpec{"AMD", "AODMetadataKeys"},
OutputSpec{"AMD", "AODMetadataVals"}};
/// Extra tables
if (enableFITextra) {
outputs.insert(outputs.end(),
{OutputForTable<FDDsExtra>::spec(),
OutputForTable<FT0sExtra>::spec(),
OutputForTable<FV0AsExtra>::spec()});
}
if (enableTRDextra) {
outputs.push_back(OutputForTable<TRDsExtra>::spec());
dataRequest->inputs.emplace_back("trdlocalgainfactors", "TRD", "LOCALGAINFACTORS", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/LocalGainFactor"));
dataRequest->inputs.emplace_back("trdnoisemap", "TRD", "NOISEMAP", 0, Lifetime::Condition, ccdbParamSpec("TRD/Calib/NoiseMapMCM"));
}

if (useMC) {
outputs.insert(outputs.end(),
Expand All @@ -3329,7 +3434,7 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
"aod-producer-workflow",
dataRequest->inputs,
outputs,
AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, ggRequest, enableSV, useMC, enableFITextra)},
AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, ggRequest, enableSV, useMC, enableFITextra, enableTRDextra)},
Options{
ConfigParamSpec{"run-number", VariantType::Int64, -1L, {"The run-number. If left default we try to get it from DPL header."}},
ConfigParamSpec{"aod-timeframe-id", VariantType::Int64, -1L, {"Set timeframe number"}},
Expand Down
4 changes: 3 additions & 1 deletion Detectors/AOD/src/aod-producer-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
{"disable-secondary-vertices", o2::framework::VariantType::Bool, false, {"disable filling secondary vertices"}},
{"disable-strangeness-tracker", o2::framework::VariantType::Bool, false, {"disable filling strangeness tracking"}},
{"enable-FIT-extra", o2::framework::VariantType::Bool, false, {"enable FIT extra output"}},
{"enable-TRD-extra", o2::framework::VariantType::Bool, false, {"enable TRD extra output"}},
{"info-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use"}},
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}},
{"combine-source-devices", o2::framework::VariantType::Bool, false, {"merge DPL source devices"}},
Expand All @@ -56,6 +57,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
bool enableST = !configcontext.options().get<bool>("disable-strangeness-tracker");
bool ctpcfgperrun = !configcontext.options().get<bool>("ctpconfig-run-independent");
bool enableFITextra = configcontext.options().get<bool>("enable-FIT-extra");
bool enableTRDextra = configcontext.options().get<bool>("enable-TRD-extra");

GID::mask_t allowedSrc = GID::getSourcesMask("ITS,MFT,MCH,MID,MCH-MID,TPC,TRD,ITS-TPC,TPC-TOF,TPC-TRD,ITS-TPC-TOF,ITS-TPC-TRD,TPC-TRD-TOF,ITS-TPC-TRD-TOF,MFT-MCH,FT0,FV0,FDD,ZDC,EMC,CTP,PHS,CPV,HMP");
GID::mask_t src = allowedSrc & GID::getSourcesMask(configcontext.options().get<std::string>("info-sources"));
Expand All @@ -66,7 +68,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
}

WorkflowSpec specs;
specs.emplace_back(o2::aodproducer::getAODProducerWorkflowSpec(src, enableSV, enableST, useMC, ctpcfgperrun, enableFITextra));
specs.emplace_back(o2::aodproducer::getAODProducerWorkflowSpec(src, enableSV, enableST, useMC, ctpcfgperrun, enableFITextra, enableTRDextra));

auto srcCls = src & ~(GID::getSourceMask(GID::MCH) | GID::getSourceMask(GID::MID)); // Don't read global MID and MCH clusters (those attached to tracks are always read)
auto srcMtc = src;
Expand Down
Loading