Skip to content

[PWGJE] Align UPC QA track selection with derived data #18264

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

Merged
nzardosh merged 1 commit into from
Oct 13, 2026
+83 −20
Merged

[PWGJE] Align UPC QA track selection with derived data #18264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
103 changes: 83 additions & 20 deletions PWGJE/Tasks/jetUpcQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ DECLARE_SOA_COLUMN(TimeZNC, timeZNC, float);
DECLARE_SOA_COLUMN(NeutronClass, neutronClass, int);
DECLARE_SOA_COLUMN(IsGapTagged, isGapTagged, bool);
DECLARE_SOA_COLUMN(IsZDCTagged, isZDCTagged, bool);
DECLARE_SOA_COLUMN(CollisionIndex, collisionIndex, int64_t);
} // namespace upcjetevent

DECLARE_SOA_TABLE(UpcJetEvents, "AOD", "UPCJETEVENT",
Expand All @@ -78,7 +79,8 @@ DECLARE_SOA_TABLE(UpcJetEvents, "AOD", "UPCJETEVENT",
upcjetevent::TimeZNC,
upcjetevent::NeutronClass,
upcjetevent::IsGapTagged,
upcjetevent::IsZDCTagged);
upcjetevent::IsZDCTagged,
upcjetevent::CollisionIndex);
using UpcJetEvent = UpcJetEvents::iterator;

namespace upcjet
Expand Down Expand Up @@ -106,13 +108,23 @@ DECLARE_SOA_INDEX_COLUMN_FULL(UpcJetEvent, upcJetEvent, int32_t, UpcJetEvents, "
DECLARE_SOA_COLUMN(Pt, pt, float);
DECLARE_SOA_COLUMN(Eta, eta, float);
DECLARE_SOA_COLUMN(Phi, phi, float);
DECLARE_SOA_COLUMN(TrackCutFlag, trackCutFlag, uint16_t);
DECLARE_SOA_COLUMN(TrackCutFlagFb5, trackCutFlagFb5, bool);
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float);
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float);
DECLARE_SOA_COLUMN(PassesConfiguredSelection, passesConfiguredSelection, bool);
} // namespace upctrack

DECLARE_SOA_TABLE(UpcTracks, "AOD", "UPCTRACK",
upctrack::UpcJetEventId,
upctrack::Pt,
upctrack::Eta,
upctrack::Phi);
upctrack::Phi,
upctrack::TrackCutFlag,
upctrack::TrackCutFlagFb5,
upctrack::DcaXY,
upctrack::DcaZ,
upctrack::PassesConfiguredSelection);
using UpcTrack = UpcTracks::iterator;

namespace upcjettrack
Expand Down Expand Up @@ -147,6 +159,7 @@ DECLARE_SOA_COLUMN(TimeZNC, timeZNC, float);
DECLARE_SOA_COLUMN(NeutronClass, neutronClass, int);
DECLARE_SOA_COLUMN(IsGapTagged, isGapTagged, bool);
DECLARE_SOA_COLUMN(IsZDCTagged, isZDCTagged, bool);
DECLARE_SOA_COLUMN(CollisionIndex, collisionIndex, int64_t);
} // namespace upcjeteventmcd

DECLARE_SOA_TABLE(UpcJetEventsMCD, "AOD", "UPCJETEVENTMCD",
Expand All @@ -159,7 +172,8 @@ DECLARE_SOA_TABLE(UpcJetEventsMCD, "AOD", "UPCJETEVENTMCD",
upcjeteventmcd::TimeZNC,
upcjeteventmcd::NeutronClass,
upcjeteventmcd::IsGapTagged,
upcjeteventmcd::IsZDCTagged);
upcjeteventmcd::IsZDCTagged,
upcjeteventmcd::CollisionIndex);
using UpcJetEventMCD = UpcJetEventsMCD::iterator;

namespace upctrackmcd
Expand All @@ -168,13 +182,23 @@ DECLARE_SOA_INDEX_COLUMN_FULL(UpcJetEventMCD, upcJetEventMCD, int32_t, UpcJetEve
DECLARE_SOA_COLUMN(Pt, pt, float);
DECLARE_SOA_COLUMN(Eta, eta, float);
DECLARE_SOA_COLUMN(Phi, phi, float);
DECLARE_SOA_COLUMN(TrackCutFlag, trackCutFlag, uint16_t);
DECLARE_SOA_COLUMN(TrackCutFlagFb5, trackCutFlagFb5, bool);
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float);
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float);
DECLARE_SOA_COLUMN(PassesConfiguredSelection, passesConfiguredSelection, bool);
} // namespace upctrackmcd

DECLARE_SOA_TABLE(UpcTracksMCD, "AOD", "UPCTRACKMCD",
upctrackmcd::UpcJetEventMCDId,
upctrackmcd::Pt,
upctrackmcd::Eta,
upctrackmcd::Phi);
upctrackmcd::Phi,
upctrackmcd::TrackCutFlag,
upctrackmcd::TrackCutFlagFb5,
upctrackmcd::DcaXY,
upctrackmcd::DcaZ,
upctrackmcd::PassesConfiguredSelection);
using UpcTrackMCD = UpcTracksMCD::iterator;

namespace upcjetmcd
Expand Down Expand Up @@ -332,8 +356,11 @@ struct JetUpcQa {
Configurable<int> cfgMaxNTracks{"cfgMaxNTracks", 100, "Max tracks"};

Configurable<float> cfgTrackPtMin{"cfgTrackPtMin", 0.15f, "Min track pT (GeV/c)"};
Configurable<float> cfgTrackPtMax{"cfgTrackPtMax", 100.f, "Max track pT (GeV/c), matching derived-data kinematics"};
Configurable<float> cfgTrackEtaMax{"cfgTrackEtaMax", 0.9f, "Max track |eta|"};
Configurable<std::string> cfgTrackSelection{"cfgTrackSelection", "kinematicsOnly", "Reconstructed-track selection: kinematicsOnly, globalTracks, or udDefault"};
Configurable<std::string> cfgTrackSelection{"cfgTrackSelection", "derivedDataSelection", "Reconstructed-track selection: derivedDataSelection, derivedQualityTracksWDCA, kinematicsOnly, globalTracks, or udDefault"};
Configurable<float> cfgDerivedTrackDCAZMax{"cfgDerivedTrackDCAZMax", 0.2f, "Maximum |DCAz| for the derived-data QualityTracksWDCA selection (cm)"};
Configurable<float> cfgVertexZCut{"cfgVertexZCut", 10.f, "Maximum absolute collision vertex z (cm)"};
Configurable<float> cfgTrackDCAZMax{"cfgTrackDCAZMax", 2.f, "Maximum |DCAz| for udDefault track selection (cm)"};
Configurable<float> cfgTrackDCAXYMax{"cfgTrackDCAXYMax", 0.f, "Maximum |DCAxy| for udDefault (cm); 0 uses the pT-dependent UD cut"};
Configurable<float> cfgTrackTPCChi2NClMax{"cfgTrackTPCChi2NClMax", 4.f, "Maximum TPC chi2 per cluster for udDefault"};
Expand Down Expand Up @@ -367,23 +394,29 @@ struct JetUpcQa {

HistogramRegistry registry{"registry"};
enum class TrackSelectionMode {
DerivedDataSelection,
DerivedQualityTracksWDCA,
KinematicsOnly,
GlobalTracks,
UDDefault
};
TrackSelectionMode trackSelectionMode = TrackSelectionMode::KinematicsOnly;
TrackSelectionMode trackSelectionMode = TrackSelectionMode::DerivedDataSelection;

// Init
void init(InitContext&)
{
if (cfgTrackSelection.value == "kinematicsOnly") {
if (cfgTrackSelection.value == "derivedDataSelection") {
trackSelectionMode = TrackSelectionMode::DerivedDataSelection;
} else if (cfgTrackSelection.value == "derivedQualityTracksWDCA") {
trackSelectionMode = TrackSelectionMode::DerivedQualityTracksWDCA;
} else if (cfgTrackSelection.value == "kinematicsOnly") {
trackSelectionMode = TrackSelectionMode::KinematicsOnly;
} else if (cfgTrackSelection.value == "globalTracks") {
trackSelectionMode = TrackSelectionMode::GlobalTracks;
} else if (cfgTrackSelection.value == "udDefault") {
trackSelectionMode = TrackSelectionMode::UDDefault;
} else {
LOGP(fatal, "Unknown cfgTrackSelection '{}'. Choose kinematicsOnly, globalTracks, or udDefault.", cfgTrackSelection.value);
LOGP(fatal, "Unknown cfgTrackSelection '{}'. Choose derivedDataSelection, derivedQualityTracksWDCA, kinematicsOnly, globalTracks, or udDefault.", cfgTrackSelection.value);
}

sgCuts.SetNDtcoll(cfgNDtcoll);
Expand Down Expand Up @@ -420,12 +453,29 @@ struct JetUpcQa {
registry.add("hSelectionBitsMCD", "Selection bits (MCD);0 all 1 gap 2 zdc 3 accepted;Counts", {HistType::kTH1F, {{4, -0.5, 3.5}}});
}

template <typename TTrack>
bool passesTrackKinematics(TTrack const& track) const
{
return std::abs(track.eta()) <= cfgTrackEtaMax.value &&
track.pt() >= cfgTrackPtMin.value &&
track.pt() <= cfgTrackPtMax.value;
}

template <typename TTrack>
bool isSelectedTrack(TTrack const& track) const
{
if (std::abs(track.eta()) > cfgTrackEtaMax.value || track.pt() < cfgTrackPtMin.value) {
if (!passesTrackKinematics(track)) {
return false;
}
if (trackSelectionMode == TrackSelectionMode::DerivedQualityTracksWDCA) {
// Mirror JetDerivedDataUtilities::setTrackSelectionBit(...): QualityTracksWDCA.
return track.isQualityTrack() && std::abs(track.dcaZ()) < cfgDerivedTrackDCAZMax.value;
}
if (trackSelectionMode == TrackSelectionMode::DerivedDataSelection) {
// Match the derived-data writer: retain tracks passing any stored selection bit
// (global, quality, or hybrid). QualityTracksWDCA is a subset of QualityTracks.
return track.isGlobalTrackWoPtEta() || track.isQualityTrack() || track.trackCutFlagFb5();
}
if (trackSelectionMode == TrackSelectionMode::KinematicsOnly) {
return true;
}
Expand Down Expand Up @@ -505,9 +555,10 @@ struct JetUpcQa {
return zdc.neutronClass > 0;
}

bool isAcceptedEvent(bool isGapTagged, bool isZDCTagged) const
bool isAcceptedEvent(bool isGapTagged, bool isZDCTagged, float posZ) const
{
return (!cfgUseGapTagging.value || isGapTagged) &&
return std::abs(posZ) <= cfgVertexZCut.value &&
(!cfgUseGapTagging.value || isGapTagged) &&
(!cfgUseZDCTagging.value || isZDCTagged);
}

Expand Down Expand Up @@ -748,7 +799,7 @@ struct JetUpcQa {
int gapSide = gapInfo.gapSide;
bool isGapTagged = isSelectedGap(gapSide);
bool isZDCTagged = isSelectedZDC(gapInfo.zdc);
bool isAccepted = isAcceptedEvent(isGapTagged, isZDCTagged);
bool isAccepted = isAcceptedEvent(isGapTagged, isZDCTagged, collision.posZ());
registry.fill(HIST("hGapSide"), gapSide);
registry.fill(HIST("hZNAEnergy"), gapInfo.zdc.energyCommonZNA);
registry.fill(HIST("hZNCEnergy"), gapInfo.zdc.energyCommonZNC);
Expand All @@ -773,7 +824,9 @@ struct JetUpcQa {
gapInfo.zdc.timeZNC,
gapInfo.zdc.neutronClass,
isGapTagged,
isZDCTagged);
isZDCTagged,
collision.globalIndex());
// This is the row index in our output event table, not the input collision index.
int evtIdx = upcJetEventTable.lastIndex();

std::vector<fastjet::PseudoJet> fjInput;
Expand All @@ -783,12 +836,17 @@ struct JetUpcQa {
if (t.collisionId() != collision.globalIndex()) {
continue;
}
if (!isSelectedTrack(t)) {
if (!passesTrackKinematics(t)) {
continue;
}
bool passesConfiguredSelection = isSelectedTrack(t);

// event-level track table
upcTrackTable(evtIdx, t.pt(), t.eta(), t.phi());
// Store all kinematically accepted candidates and the current decision so
// alternate track selections can be reproduced from the output table.
upcTrackTable(evtIdx, t.pt(), t.eta(), t.phi(), t.trackCutFlag(), t.trackCutFlagFb5(), t.dcaXY(), t.dcaZ(), passesConfiguredSelection);
if (!passesConfiguredSelection) {
continue;
}

// jet finding input
fastjet::PseudoJet p;
Expand Down Expand Up @@ -843,7 +901,7 @@ struct JetUpcQa {
int gapSide = gapInfo.gapSide;
bool isGapTagged = isSelectedGap(gapSide);
bool isZDCTagged = isSelectedZDC(gapInfo.zdc);
bool isAccepted = isAcceptedEvent(isGapTagged, isZDCTagged);
bool isAccepted = isAcceptedEvent(isGapTagged, isZDCTagged, collision.posZ());
registry.fill(HIST("hGapSideMCD"), gapSide);
registry.fill(HIST("hZNAEnergyMCD"), gapInfo.zdc.energyCommonZNA);
registry.fill(HIST("hZNCEnergyMCD"), gapInfo.zdc.energyCommonZNC);
Expand All @@ -868,7 +926,8 @@ struct JetUpcQa {
gapInfo.zdc.timeZNC,
gapInfo.zdc.neutronClass,
isGapTagged,
isZDCTagged);
isZDCTagged,
collision.globalIndex());
int evtIdx = upcJetEventTableMCD.lastIndex();

std::vector<fastjet::PseudoJet> fjInput;
Expand All @@ -878,11 +937,15 @@ struct JetUpcQa {
if (t.collisionId() != collision.globalIndex()) {
continue;
}
if (!isSelectedTrack(t)) {
if (!passesTrackKinematics(t)) {
continue;
}
bool passesConfiguredSelection = isSelectedTrack(t);

upcTrackTableMCD(evtIdx, t.pt(), t.eta(), t.phi());
upcTrackTableMCD(evtIdx, t.pt(), t.eta(), t.phi(), t.trackCutFlag(), t.trackCutFlagFb5(), t.dcaXY(), t.dcaZ(), passesConfiguredSelection);
if (!passesConfiguredSelection) {
continue;
}

fastjet::PseudoJet p;
p.reset_PtYPhiM(t.pt(), t.eta(), t.phi(), o2::constants::physics::MassPiPlus);
Expand Down
Loading