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"
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"
@@ -390,6 +392,79 @@ void AODProducerWorkflowDPL::addToTracksQATable(TracksQACursorType& tracksQACurs
390392 trackQAInfoHolder.dTofdZ );
391393}
392394
395+ template <typename TRDsExtraCursorType>
396+ void AODProducerWorkflowDPL::addToTRDsExtra (const o2::globaltracking::RecoContainer& recoData, TRDsExtraCursorType& trdExtraCursor, const GIndex& trkIdx, int trkTableIdx)
397+ {
398+ static int q0s[6 ] = {-1 }, q1s[6 ] = {-1 }, q2s[6 ] = {-1 };
399+ static float q0sCor[6 ] = {-1 }, q1sCor[6 ] = {-1 }, q2sCor[6 ] = {-1 };
400+ static float ttgls[6 ] = {-999 }, tphis[6 ] = {-999 };
401+
402+ auto contributorsGID = recoData.getSingleDetectorRefs (trkIdx);
403+ if (!contributorsGID[GIndex::Source::TRD].isIndexSet ()) { // should be redunant
404+ return ;
405+ }
406+ const auto & trk = recoData.getTrack <o2::trd::TrackTRD>(contributorsGID[GIndex::Source::TRD]);
407+ auto trkC = trk;
408+ const auto & trklets = recoData.getTRDTracklets ();
409+ const auto & ctrklets = recoData.getTRDCalibratedTracklets ();
410+ for (int iLay{0 }; iLay < 6 ; ++iLay) {
411+ q0s[iLay] = q1s[iLay] = q2s[iLay] = -1 ;
412+ q0sCor[iLay] = q1sCor[iLay] = q2sCor[iLay] = -1 ;
413+ tphis[iLay] = ttgls[iLay] = -999 ;
414+ auto trkltId = trk.getTrackletIndex (iLay);
415+ if (trkltId < 0 ) {
416+ continue ;
417+ }
418+ const auto & tracklet = trklets[trkltId];
419+ if (mTRDNoiseMap ->isTrackletFromNoisyMCM (tracklet)) {
420+ continue ;
421+ }
422+ // we need to propagate into TRD local system
423+ int trkltDet = tracklet.getDetector ();
424+ int trkltSec = trkltDet / 30 ;
425+ if (trkltSec != o2::math_utils::angle2Sector (trkC.getAlpha ())) {
426+ if (!trkC.rotate (o2::math_utils::sector2Angle (trkltSec))) {
427+ break ;
428+ }
429+ }
430+ if (!o2::base::Propagator::Instance ()->PropagateToXBxByBz (trkC, ctrklets[trkltId].getX (), o2::base::Propagator::MAX_SIN_PHI, o2::base::Propagator::MAX_STEP, mMatCorr )) {
431+ break ;
432+ }
433+
434+ auto tphi = trkC.getSnp () / std::sqrt ((1 .f - trkC.getSnp ()) * (1 .f + trkC.getSnp ()));
435+ auto trackletLength = std::sqrt (1 .f + tphi * tphi + trkC.getTgl () * trkC.getTgl ());
436+ float cor = mTRDLocalGain ->getValue (tracklet.getHCID () / 2 , tracklet.getPadCol (), tracklet.getPadRow ()) * trackletLength;
437+ q0s[iLay] = tracklet.getQ0 ();
438+ q1s[iLay] = tracklet.getQ1 ();
439+ q2s[iLay] = tracklet.getQ2 ();
440+ q0sCor[iLay] = (float )tracklet.getQ0 () / cor;
441+ q1sCor[iLay] = (float )tracklet.getQ1 () / cor;
442+ q2sCor[iLay] = (float )tracklet.getQ2 () / cor;
443+ ttgls[iLay] = trkC.getTgl ();
444+ tphis[iLay] = tphi;
445+
446+ // z-row merging
447+ if (trk.getIsCrossingNeighbor (iLay) && trk.getHasNeighbor ()) {
448+ for (const auto & trklt : trklets) {
449+ if (tracklet.getTrackletWord () == trklt.getTrackletWord ()) {
450+ continue ;
451+ }
452+ if (std::abs (tracklet.getPadCol () - trklt.getPadCol ()) <= 1 && std::abs (tracklet.getPadRow () - trklt.getPadRow ()) == 1 ) {
453+ cor = mTRDLocalGain ->getValue (trklt.getHCID () / 2 , trklt.getPadCol (), trklt.getPadRow ()) * trackletLength;
454+ q0s[iLay] += trklt.getQ0 ();
455+ q1s[iLay] += trklt.getQ1 ();
456+ q2s[iLay] += trklt.getQ2 ();
457+ q0sCor[iLay] += (float )trklt.getQ0 () / cor;
458+ q1sCor[iLay] += (float )trklt.getQ1 () / cor;
459+ q2sCor[iLay] += (float )trklt.getQ2 () / cor;
460+ }
461+ }
462+ }
463+ }
464+
465+ trdExtraCursor (trkTableIdx, q0s, q1s, q2s, q0sCor, q1sCor, q2sCor, ttgls, tphis);
466+ }
467+
393468template <typename mftTracksCursorType, typename AmbigMFTTracksCursorType>
394469void AODProducerWorkflowDPL::addToMFTTracksTable (mftTracksCursorType& mftTracksCursor, AmbigMFTTracksCursorType& ambigMFTTracksCursor,
395470 GIndex trackID, const o2::globaltracking::RecoContainer& data, int collisionID,
@@ -430,8 +505,7 @@ void AODProducerWorkflowDPL::addToMFTTracksTable(mftTracksCursorType& mftTracksC
430505 ambigMFTTracksCursor (mTableTrMFTID , bcSlice);
431506 }
432507}
433-
434- template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename AmbigTracksCursorType,
508+ template <typename TracksCursorType, typename TracksCovCursorType, typename TracksExtraCursorType, typename TracksQACursorType, typename TRDsExtraCursor, typename AmbigTracksCursorType,
435509 typename MFTTracksCursorType, typename MFTTracksCovCursorType, typename AmbigMFTTracksCursorType,
436510 typename FwdTracksCursorType, typename FwdTracksCovCursorType, typename AmbigFwdTracksCursorType, typename FwdTrkClsCursorType>
437511void AODProducerWorkflowDPL::fillTrackTablesPerCollision (int collisionID,
@@ -443,6 +517,7 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
443517 TracksCovCursorType& tracksCovCursor,
444518 TracksExtraCursorType& tracksExtraCursor,
445519 TracksQACursorType& tracksQACursor,
520+ TRDsExtraCursor& trdsExtraCursor,
446521 AmbigTracksCursorType& ambigTracksCursor,
447522 MFTTracksCursorType& mftTracksCursor,
448523 MFTTracksCovCursorType& mftTracksCovCursor,
@@ -553,7 +628,9 @@ void AODProducerWorkflowDPL::fillTrackTablesPerCollision(int collisionID,
553628 addToTracksTable (tracksCursor, tracksCovCursor, trOrig, collisionID, aod::track::TrackIU);
554629 }
555630 addToTracksExtraTable (tracksExtraCursor, extraInfoHolder);
556-
631+ if (mEnableTRDextra && trackIndex.includesDet (GIndex::Source::TRD)) {
632+ addToTRDsExtra (data, trdsExtraCursor, trackIndex, mTableTrID );
633+ }
557634 // collecting table indices of barrel tracks for V0s table
558635 if (extraInfoHolder.bcSlice [0 ] >= 0 && collisionID < 0 ) {
559636 ambigTracksCursor (mTableTrID , extraInfoHolder.bcSlice );
@@ -1906,11 +1983,8 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
19061983 auto trackedV0Cursor = createTableCursor<o2::aod::TrackedV0s>(pc);
19071984 auto tracked3BodyCurs = createTableCursor<o2::aod::Tracked3Bodys>(pc);
19081985 auto fddCursor = createTableCursor<o2::aod::FDDs>(pc);
1909- auto fddExtraCursor = createTableCursor<o2::aod::FDDsExtra>(pc);
19101986 auto ft0Cursor = createTableCursor<o2::aod::FT0s>(pc);
1911- auto ft0ExtraCursor = createTableCursor<o2::aod::FT0sExtra>(pc);
19121987 auto fv0aCursor = createTableCursor<o2::aod::FV0As>(pc);
1913- auto fv0aExtraCursor = createTableCursor<o2::aod::FV0AsExtra>(pc);
19141988 auto fwdTracksCursor = createTableCursor<o2::aod::StoredFwdTracks>(pc);
19151989 auto fwdTracksCovCursor = createTableCursor<o2::aod::StoredFwdTracksCov>(pc);
19161990 auto fwdTrkClsCursor = createTableCursor<o2::aod::FwdTrkCls>(pc);
@@ -1931,6 +2005,21 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
19312005 auto cpvClustersCursor = createTableCursor<o2::aod::CPVClusters>(pc);
19322006 auto originCursor = createTableCursor<o2::aod::Origins>(pc);
19332007
2008+ // / Extra tables
2009+ o2::framework::Produces<o2::aod::FT0sExtra> ft0ExtraCursor;
2010+ o2::framework::Produces<o2::aod::FDDsExtra> fddExtraCursor;
2011+ o2::framework::Produces<o2::aod::FV0AsExtra> fv0aExtraCursor;
2012+
2013+ if (mEnableFITextra ) {
2014+ ft0ExtraCursor = createTableCursor<o2::aod::FT0sExtra>(pc);
2015+ fddExtraCursor = createTableCursor<o2::aod::FDDsExtra>(pc);
2016+ fv0aExtraCursor = createTableCursor<o2::aod::FV0AsExtra>(pc);
2017+ }
2018+ o2::framework::Produces<o2::aod::TRDsExtra> trdExtraCursor;
2019+ if (mEnableTRDextra ) {
2020+ trdExtraCursor = createTableCursor<o2::aod::TRDsExtra>(pc);
2021+ }
2022+
19342023 // Declare MC cursors type without adding the output for a table
19352024 o2::framework::Produces<o2::aod::McCollisionLabels> mcColLabelsCursor;
19362025 o2::framework::Produces<o2::aod::McCollisions> mcCollisionsCursor;
@@ -2297,7 +2386,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
22972386 // so that all unassigned tracks are stored in the beginning of the table together
22982387 auto & trackRef = primVer2TRefs.back (); // references to unassigned tracks are at the end
22992388 // fixme: interaction time is undefined for unassigned tracks (?)
2300- fillTrackTablesPerCollision (-1 , std::uint64_t (-1 ), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor,
2389+ fillTrackTablesPerCollision (-1 , std::uint64_t (-1 ), trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, trdExtraCursor,
23012390 ambigTracksCursor, mftTracksCursor, mftTracksCovCursor, ambigMFTTracksCursor,
23022391 fwdTracksCursor, fwdTracksCovCursor, ambigFwdTracksCursor, fwdTrkClsCursor, bcsMap);
23032392
@@ -2339,7 +2428,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
23392428
23402429 auto & trackRef = primVer2TRefs[collisionID];
23412430 // passing interaction time in [ps]
2342- fillTrackTablesPerCollision (collisionID, globalBC, trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, ambigTracksCursor,
2431+ fillTrackTablesPerCollision (collisionID, globalBC, trackRef, primVerGIs, recoData, tracksCursor, tracksCovCursor, tracksExtraCursor, tracksQACursor, trdExtraCursor, ambigTracksCursor,
23432432 mftTracksCursor, mftTracksCovCursor, ambigMFTTracksCursor,
23442433 fwdTracksCursor, fwdTracksCovCursor, ambigFwdTracksCursor, fwdTrkClsCursor, bcsMap);
23452434 collisionID++;
@@ -3004,6 +3093,10 @@ void AODProducerWorkflowDPL::updateTimeDependentParams(ProcessingContext& pc)
30043093 mFieldON = std::abs (o2::base::Propagator::Instance ()->getNominalBz ()) > 0.01 ;
30053094
30063095 pc.inputs ().get <o2::ctp::CTPConfiguration*>(" ctpconfig" );
3096+ if (mEnableTRDextra ) {
3097+ mTRDLocalGain = pc.inputs ().get <o2::trd::LocalGainFactor*>(" trdlocalgainfactors" ).get ();
3098+ mTRDNoiseMap = pc.inputs ().get <o2::trd::NoiseStatusMCM*>(" trdnoisemap" ).get ();
3099+ }
30073100 }
30083101 if (mPropTracks ) {
30093102 pc.inputs ().get <o2::dataformats::MeanVertexObject*>(" meanvtx" );
@@ -3215,7 +3308,7 @@ void AODProducerWorkflowDPL::endOfStream(EndOfStreamContext& /*ec*/)
32153308 mStreamer .reset ();
32163309}
32173310
3218- DataProcessorSpec getAODProducerWorkflowSpec (GID::mask_t src, bool enableSV, bool enableStrangenessTracking, bool useMC, bool CTPConfigPerRun, bool enableFITextra)
3311+ DataProcessorSpec getAODProducerWorkflowSpec (GID::mask_t src, bool enableSV, bool enableStrangenessTracking, bool useMC, bool CTPConfigPerRun, bool enableFITextra, bool enableTRDextra )
32193312{
32203313 auto dataRequest = std::make_shared<DataRequest>();
32213314 dataRequest->inputs .emplace_back (" ctpconfig" , " CTP" , " CTPCONFIG" , 0 , Lifetime::Condition, ccdbParamSpec (" CTP/Config/Config" , CTPConfigPerRun));
@@ -3306,6 +3399,18 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
33063399 OutputSpec{" TFF" , " TFFilename" },
33073400 OutputSpec{" AMD" , " AODMetadataKeys" },
33083401 OutputSpec{" AMD" , " AODMetadataVals" }};
3402+ // / Extra tables
3403+ if (enableFITextra) {
3404+ outputs.insert (outputs.end (),
3405+ {OutputForTable<FDDsExtra>::spec (),
3406+ OutputForTable<FT0sExtra>::spec (),
3407+ OutputForTable<FV0AsExtra>::spec ()});
3408+ }
3409+ if (enableTRDextra) {
3410+ outputs.push_back (OutputForTable<TRDsExtra>::spec ());
3411+ dataRequest->inputs .emplace_back (" trdlocalgainfactors" , " TRD" , " LOCALGAINFACTORS" , 0 , Lifetime::Condition, ccdbParamSpec (" TRD/Calib/LocalGainFactor" ));
3412+ dataRequest->inputs .emplace_back (" trdnoisemap" , " TRD" , " NOISEMAP" , 0 , Lifetime::Condition, ccdbParamSpec (" TRD/Calib/NoiseMapMCM" ));
3413+ }
33093414
33103415 if (useMC) {
33113416 outputs.insert (outputs.end (),
@@ -3329,7 +3434,7 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool enableSV, boo
33293434 " aod-producer-workflow" ,
33303435 dataRequest->inputs ,
33313436 outputs,
3332- AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, ggRequest, enableSV, useMC, enableFITextra)},
3437+ AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, ggRequest, enableSV, useMC, enableFITextra, enableTRDextra )},
33333438 Options{
33343439 ConfigParamSpec{" run-number" , VariantType::Int64, -1L , {" The run-number. If left default we try to get it from DPL header." }},
33353440 ConfigParamSpec{" aod-timeframe-id" , VariantType::Int64, -1L , {" Set timeframe number" }},
0 commit comments