Skip to content

[PWGLF] add ntracks to the minicoll table + make trkl eta cuts configurable #11785

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
maciacco merged 1 commit into from
Jun 26, 2025
Merged

[PWGLF] add ntracks to the minicoll table + make trkl eta cuts configurable #11785

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion PWGLF/DataModel/LFEbyeTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -8,7 +8,7 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

Check failure on line 11 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 11 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \brief is missing, incorrect or misplaced.

Check failure on line 11 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"

Expand All @@ -18,7 +18,7 @@
namespace o2::aod
{

namespace LFEbyeCollTable

Check failure on line 21 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/namespace] 

Use snake_case for names of namespaces. Double underscores are not allowed.
{
DECLARE_SOA_COLUMN(Centrality, centrality, uint8_t);
DECLARE_SOA_COLUMN(Zvtx, zvtx, float);
Expand All @@ -26,6 +26,7 @@
DECLARE_SOA_COLUMN(TriggerMask, triggerMask, uint8_t);
DECLARE_SOA_COLUMN(Ntracklets, ntracklets, uint8_t);
DECLARE_SOA_COLUMN(V0Multiplicity, v0Multiplicity, uint8_t);
DECLARE_SOA_COLUMN(Ntracks, ntracks, uint8_t);
} // namespace LFEbyeCollTable

DECLARE_SOA_TABLE(CollEbyeTables, "AOD", "COLLEBYETABLE",
Expand All @@ -39,7 +40,8 @@
LFEbyeCollTable::ZvtxMask,
LFEbyeCollTable::TriggerMask,
LFEbyeCollTable::Ntracklets,
LFEbyeCollTable::V0Multiplicity);
LFEbyeCollTable::V0Multiplicity,
LFEbyeCollTable::Ntracks);
using MiniCollTable = MiniCollTables::iterator;

namespace LFEbyeTable
Expand All @@ -53,11 +55,11 @@
DECLARE_SOA_COLUMN(TpcNcls, tpcNcls, uint8_t);
DECLARE_SOA_COLUMN(TpcNsigma, tpcNsigma, float);
DECLARE_SOA_COLUMN(TofMass, tofMass, float);
DECLARE_SOA_COLUMN(DcaV0PV, dcaV0Pv, float);

Check failure on line 58 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DcaNegPV, dcaNegPv, float);

Check failure on line 59 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DcaPosPV, dcaPosPv, float);

Check failure on line 60 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(DcaV0Tracks, dcaV0tracks, float);

Check failure on line 61 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(CosPA, cosPa, double);

Check failure on line 62 in PWGLF/DataModel/LFEbyeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TpcNsigmaNeg, tpcNsigmaNeg, float);
DECLARE_SOA_COLUMN(TpcNsigmaPos, tpcNsigmaPos, float);
DECLARE_SOA_COLUMN(IdNeg, idNeg, int64_t);
Expand Down
15 changes: 8 additions & 7 deletions PWGLF/TableProducer/Nuspex/ebyeMaker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ namespace
constexpr int kNpart = 2;
constexpr float trackSels[12]{/* 60, */ 80, 100, 2, 3, /* 4, */ 0.05, 0.1, /* 0.15, */ 0.5, 1, /* 1.5, */ 2, 3 /* , 4 */, 2, 3, /*, 4 */};
constexpr float dcaSels[3]{10., 10., 10.};
constexpr float trklSels[3]{1.2, 0.6, 0.7};
constexpr double betheBlochDefault[kNpart][6]{{-1.e32, -1.e32, -1.e32, -1.e32, -1.e32, -1.e32}, {-1.e32, -1.e32, -1.e32, -1.e32, -1.e32, -1.e32}};
constexpr double betheBlochDefaultITS[6]{-1.e32, -1.e32, -1.e32, -1.e32, -1.e32, -1.e32};
constexpr double estimatorsCorrelationCoef[2]{-0.669108, 1.04489};
Expand All @@ -76,6 +77,7 @@ static const std::vector<std::string> particleNamesPar{"p", "d"};
static const std::vector<std::string> trackSelsNames{"tpcClsMid", "tpcClsTight", "chi2TpcTight", "chi2TpcMid", "dcaxyTight", "dcaxyMid", "dcazTight", "dcazMid", "tpcNsigmaTight", "tpcNsigmaMid", "itsNsigmaTight", "itsNsigmaMid"};
static const std::vector<std::string> dcaSelsNames{"dcaxy", "dcaz", "dca"};
static const std::vector<std::string> particleName{"p"};
static const std::vector<std::string> trklSelsNames{"etaMaxTot", "etaMaxInner", "etaMinOuter"};
std::array<std::shared_ptr<TH3>, kNpart> tofMass;
void momTotXYZ(std::array<float, 3>& momA, std::array<float, 3> const& momB, std::array<float, 3> const& momC)
{
Expand Down Expand Up @@ -248,7 +250,6 @@ struct EbyeMaker {
Configurable<float> etaMaxV0dau{"etaMaxV0dau", 0.8f, "maximum eta V0 daughters"};
Configurable<float> outerPIDMin{"outerPIDMin", -4.f, "minimum outer PID"};

Configurable<bool> storeTracksNum{"storeTracksNum", false, "store the number of tracks instead of tracklets"};
Configurable<std::string> genName{"genname", "", "Genearator name: HIJING, PYTHIA8, ... Default: \"\""};

Configurable<uint8_t> triggerCut{"triggerCut", 0x0, "trigger cut to select"};
Expand Down Expand Up @@ -307,6 +308,7 @@ struct EbyeMaker {
Configurable<float> antidPtItsClsSizeCut{"antidPtItsClsSizeCut", 10.f, "pt for cluster size cut for antideuterons"};

Configurable<LabeledArray<float>> cfgTrackSels{"cfgTrackSels", {trackSels, 1, 12, particleName, trackSelsNames}, "Track selections"};
Configurable<LabeledArray<float>> cfgTrklSels{"cfgTrklSels", {trklSels, 1, 3, particleName, trklSelsNames}, "Tracklet selections (eta)"};

std::array<float, kNpart> ptMin;
std::array<float, kNpart> ptTof;
Expand Down Expand Up @@ -673,13 +675,12 @@ struct EbyeMaker {
std::array<float, 2> dcaInfo;
uint8_t nTracklets[2]{0, 0};
uint8_t nTracks{0};
const float tklEtaCuts[]{1.2, 0.6, 0.7};
for (const auto& track : tracks) {

if (track.trackType() == o2::aod::track::TrackTypeEnum::Run2Tracklet && std::abs(track.eta()) < tklEtaCuts[0]) { // tracklet
if (std::abs(track.eta()) < tklEtaCuts[1])
if (track.trackType() == o2::aod::track::TrackTypeEnum::Run2Tracklet && std::abs(track.eta()) < cfgTrklSels->get("etaMaxTot")) { // tracklet
if (std::abs(track.eta()) < cfgTrklSels->get("etaMaxInner"))
nTracklets[0]++;
else if (std::abs(track.eta()) > tklEtaCuts[2])
else if (std::abs(track.eta()) > cfgTrklSels->get("etaMinOuter"))
nTracklets[1]++;
}

Expand Down Expand Up @@ -1251,7 +1252,7 @@ struct EbyeMaker {
if (triggerCut != 0x0 && (trigger & triggerCut) != triggerCut) {
continue;
}
miniCollTable(static_cast<int8_t>(collision.posZ() * 10), trigger, storeTracksNum ? nTracksColl : nTrackletsColl, cV0M);
miniCollTable(static_cast<int8_t>(collision.posZ() * 10), trigger, nTrackletsColl, cV0M, nTracksColl);

for (auto& candidateTrack : candidateTracks[0]) { // o2-linter: disable=const-ref-in-for-loop (not a const ref)
auto tk = tracks.rawIteratorAt(candidateTrack.globalIndex);
Expand Down Expand Up @@ -1443,7 +1444,7 @@ struct EbyeMaker {
fillMcEvent(collision, tracks, v0TableThisCollision, cV0M, mcParticles, mcLab);
fillMcGen(mcParticles, mcLab, collision.mcCollisionId());

miniCollTable(static_cast<int8_t>(collision.posZ() * 10), 0x0, storeTracksNum ? nTracksColl : nTrackletsColl, cV0M);
miniCollTable(static_cast<int8_t>(collision.posZ() * 10), 0x0, nTrackletsColl, cV0M, nTracksColl);

for (auto& candidateTrack : candidateTracks[0]) { // o2-linter: disable=const-ref-in-for-loop (not a const ref)
int selMask = -1;
Expand Down
Loading