Skip to content

Commit f15a83f

Browse files
authored
[DPG] Remove dependency on TrackQA table if not used in D0 calibration task (#13333)
1 parent 46c62b1 commit f15a83f

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

DPG/Tasks/AOTTrack/derivedDataCreatorD0Calibration.cxx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ struct DerivedDataCreatorD0Calibration {
104104
std::string prefix = "ml";
105105
} cfgMl;
106106

107-
using TracksWCovExtraPid = soa::Join<aod::Tracks, aod::TrackToTmo, aod::TrackToTracksQA, aod::TracksCov, aod::TracksExtra, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa>;
107+
using TracksWCovExtraPid = soa::Join<aod::Tracks, aod::TrackToTmo, aod::TracksCov, aod::TracksExtra, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa>;
108+
using TracksWCovExtraPidAndQa = soa::Join<aod::Tracks, aod::TrackToTmo, aod::TrackToTracksQA, aod::TracksCov, aod::TracksExtra, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa>;
108109
using CollisionsWEvSel = soa::Join<aod::Collisions, aod::CentFT0Cs, aod::EvSels>;
109110
using TrackMeanOccs = soa::Join<aod::TmoTrackIds, aod::TmoPrim, aod::TmoT0V0, aod::TmoRT0V0Prim, aod::TwmoPrim, aod::TwmoT0V0, aod::TwmoRT0V0Prim>;
110111

@@ -169,10 +170,10 @@ struct DerivedDataCreatorD0Calibration {
169170
}
170171

171172
// main function
172-
template <bool withTrackQa, typename TTrackQa>
173+
template <bool withTrackQa, typename TTrackQa, typename TTracks>
173174
void runDataCreation(CollisionsWEvSel const& collisions,
174175
aod::TrackAssoc const& trackIndices,
175-
TracksWCovExtraPid const&,
176+
TTracks const&,
176177
aod::BCsWithTimestamps const&,
177178
TrackMeanOccs const&,
178179
TTrackQa const&)
@@ -203,7 +204,7 @@ struct DerivedDataCreatorD0Calibration {
203204

204205
auto groupedTrackIndices = trackIndices.sliceBy(trackIndicesPerCollision, collision.globalIndex());
205206
for (auto const& trackIndexPos : groupedTrackIndices) {
206-
auto trackPos = trackIndexPos.template track_as<TracksWCovExtraPid>();
207+
auto trackPos = trackIndexPos.template track_as<TTracks>();
207208
// track selections
208209
if (trackPos.sign() < 0) { // first positive track
209210
continue;
@@ -239,7 +240,7 @@ struct DerivedDataCreatorD0Calibration {
239240
}
240241

241242
for (auto const& trackIndexNeg : groupedTrackIndices) {
242-
auto trackNeg = trackIndexNeg.template track_as<TracksWCovExtraPid>();
243+
auto trackNeg = trackIndexNeg.template track_as<TTracks>();
243244
// track selections
244245
if (trackNeg.sign() > 0) { // second negative track
245246
continue;
@@ -484,7 +485,7 @@ struct DerivedDataCreatorD0Calibration {
484485
uint8_t tmoRobustT0V0PrimUnfm80{0u};
485486
uint8_t twmoRobustT0V0PrimUnfm80{0u};
486487
if (trackPos.has_tmo()) {
487-
auto tmoFromTrack = trackPos.tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
488+
auto tmoFromTrack = trackPos.template tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
488489
tmoPrimUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoPrimUnfm80());
489490
tmoFV0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFV0AUnfm80());
490491
tmoFT0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFT0AUnfm80());
@@ -649,7 +650,7 @@ struct DerivedDataCreatorD0Calibration {
649650
uint8_t tmoRobustT0V0PrimUnfm80{0u};
650651
uint8_t twmoRobustT0V0PrimUnfm80{0u};
651652
if (trackNeg.has_tmo()) {
652-
auto tmoFromTrack = trackNeg.tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
653+
auto tmoFromTrack = trackNeg.template tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
653654
tmoPrimUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoPrimUnfm80());
654655
tmoFV0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFV0AUnfm80());
655656
tmoFT0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFT0AUnfm80());
@@ -835,7 +836,7 @@ struct DerivedDataCreatorD0Calibration {
835836
// process functions
836837
void processWithTrackQa(CollisionsWEvSel const& collisions,
837838
aod::TrackAssoc const& trackIndices,
838-
TracksWCovExtraPid const& tracks,
839+
TracksWCovExtraPidAndQa const& tracks,
839840
aod::BCsWithTimestamps const& bcs,
840841
TrackMeanOccs const& occ,
841842
aod::TracksQAVersion const& trackQa)

0 commit comments

Comments
 (0)