Skip to content

Commit feb6a0e

Browse files
TrackSelection: revert to uint8_t columns (#5015)
1 parent 7ff4d65 commit feb6a0e

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

Analysis/DataModel/include/AnalysisDataModel/TrackSelectionTables.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ DECLARE_SOA_COLUMN(DcaXY, dcaXY, float);
2222
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float);
2323

2424
// Columns to store track filter decisions
25-
DECLARE_SOA_COLUMN(IsGlobalTrack, isGlobalTrack, bool);
26-
DECLARE_SOA_COLUMN(IsGlobalTrackSDD, isGlobalTrackSDD, bool);
25+
DECLARE_SOA_COLUMN(IsGlobalTrack, isGlobalTrack, uint8_t);
26+
DECLARE_SOA_COLUMN(IsGlobalTrackSDD, isGlobalTrackSDD, uint8_t);
2727

2828
} // namespace track
2929
DECLARE_SOA_TABLE(TracksExtended, "AOD", "TRACKEXTENDED", track::DcaXY,

Analysis/Tasks/PWGCF/correlations.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct CorrelationTask {
5858

5959
// Filters and input definitions
6060
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
61-
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPt) && ((aod::track::isGlobalTrack == true) || (aod::track::isGlobalTrackSDD == true));
61+
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPt) && ((aod::track::isGlobalTrack == (uint8_t) true) || (aod::track::isGlobalTrackSDD == (uint8_t) true));
6262
using myTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection>>;
6363

6464
// Output definitions

Analysis/Tasks/PWGCF/filterCF.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct FilterCF {
3434

3535
// Filters and input definitions
3636
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex && aod::cent::centV0M <= 80.0f;
37-
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPt) && ((aod::track::isGlobalTrack == true) || (aod::track::isGlobalTrackSDD == true));
37+
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPt) && ((aod::track::isGlobalTrack == (uint8_t) true) || (aod::track::isGlobalTrackSDD == (uint8_t) true));
3838

3939
OutputObj<TH3F> yields{TH3F("yields", "centrality vs pT vs eta", 100, 0, 100, 40, 0, 20, 100, -2, 2)};
4040
OutputObj<TH3F> etaphi{TH3F("etaphi", "centrality vs eta vs phi", 100, 0, 100, 100, -2, 2, 200, 0, 2 * M_PI)};

Analysis/Tasks/PWGLF/mcspectraefficiency.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ struct ReconstructedTask {
104104
OutputObj<TH2F> pDiff{TH2F("pDiff", "pDiff;#it{p}_{MC} #it{p}_{Rec} (GeV/#it{c})", 500, -2, 2, PDGBINNING)};
105105

106106
Filter trackAcceptance = (nabs(aod::track::eta) < 0.8f);
107-
Filter trackCuts = ((aod::track::isGlobalTrack == true) || (aod::track::isGlobalTrackSDD == true));
107+
Filter trackCuts = ((aod::track::isGlobalTrack == (uint8_t) true) || (aod::track::isGlobalTrackSDD == (uint8_t) true));
108108

109109
void process(soa::Join<aod::Collisions, aod::McCollisionLabels>::iterator const& collision,
110110
soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksExtended, aod::McTrackLabels, aod::TrackSelection>> const& tracks,

Analysis/Tasks/PWGLF/spectraTOF.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct TOFSpectraTask {
4949
Configurable<float> nsigmacut{"nsigmacut", 3, "Value of the Nsigma cut"};
5050

5151
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
52-
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::isGlobalTrack == true) && (aod::track::tofSignal > 0.f);
52+
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::isGlobalTrack == (uint8_t) true) && (aod::track::tofSignal > 0.f);
5353
using TrackCandidates = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::pidRespTOF, aod::pidRespTOFbeta, aod::TrackSelection>>;
5454
void process(TrackCandidates::iterator const& track)
5555
{

Analysis/Tasks/PWGLF/spectraTPC.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
3333
Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"}; \
3434
Configurable<float> cfgCutEta{"cfgCutEta", 0.8f, "Eta range for tracks"}; \
3535
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; \
36-
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::isGlobalTrack == true);
36+
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::isGlobalTrack == (uint8_t) true);
3737

3838
#define makelogaxis(h) \
3939
{ \

Analysis/Tasks/PWGLF/trackchecks.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ struct TrackCheckTaskEvSelTrackSel {
240240

241241
//Filters
242242
Filter collfilter = nabs(aod::collision::posZ) < cfgCutVZ;
243-
Filter trackfilter = aod::track::isGlobalTrack == true;
243+
Filter trackfilter = aod::track::isGlobalTrack == (uint8_t) true;
244244
void process(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels>>::iterator const& col,
245245
soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksExtended,
246246
aod::TrackSelection, aod::McTrackLabels>>& tracks,

Analysis/Tasks/trackqa.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct TrackQATask {
4444

4545
Configurable<int> selectedTracks{"select", 1, "Choice of track selection. 0 = no selection, 1 = globalTracks, 2 = globalTracksSDD"};
4646

47-
Filter trackFilter = aod::track::isGlobalTrack == true;
47+
Filter trackFilter = aod::track::isGlobalTrack == (uint8_t) true;
4848

4949
void init(o2::framework::InitContext&)
5050
{

Analysis/Tasks/trackselection.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ struct TrackSelectionTask {
4444
void process(soa::Join<aod::FullTracks, aod::TracksExtended> const& tracks)
4545
{
4646
for (auto& track : tracks) {
47-
filterTable(globalTracks.IsSelected(track),
48-
globalTracksSDD.IsSelected(track));
47+
filterTable((uint8_t)globalTracks.IsSelected(track),
48+
(uint8_t)globalTracksSDD.IsSelected(track));
4949
}
5050
}
5151
};

0 commit comments

Comments
 (0)