Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions PWGLF/DataModel/LFSlimNucleiTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
DECLARE_SOA_COLUMN(Pt, pt, float);
DECLARE_SOA_COLUMN(Eta, eta, float);
DECLARE_SOA_COLUMN(Phi, phi, float);
DECLARE_SOA_COLUMN(TPCInnerParam, tpcInnerParam, float);

Check failure on line 31 in PWGLF/DataModel/LFSlimNucleiTables.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(Beta, beta, float);
DECLARE_SOA_COLUMN(Zvertex, zVertex, float);

Check failure on line 33 in PWGLF/DataModel/LFSlimNucleiTables.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(NContrib, nContrib, int);
DECLARE_SOA_COLUMN(DCAxy, dcaxy, float);

Check failure on line 35 in PWGLF/DataModel/LFSlimNucleiTables.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(DCAz, dcaz, float);

Check failure on line 36 in PWGLF/DataModel/LFSlimNucleiTables.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(TPCsignal, tpcSignal, float);

Check failure on line 37 in PWGLF/DataModel/LFSlimNucleiTables.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(ITSchi2, itsChi2, float);

Check failure on line 38 in PWGLF/DataModel/LFSlimNucleiTables.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(TPCchi2, tpcChi2, float);

Check failure on line 39 in PWGLF/DataModel/LFSlimNucleiTables.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(TOFchi2, tofChi2, float);

Check failure on line 40 in PWGLF/DataModel/LFSlimNucleiTables.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(Flags, flags, uint16_t);
DECLARE_SOA_COLUMN(TPCfindableCls, tpcFindableCls, uint8_t);

Check failure on line 42 in PWGLF/DataModel/LFSlimNucleiTables.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(TPCcrossedRows, tpcCrossedRows, uint8_t);

Check failure on line 43 in PWGLF/DataModel/LFSlimNucleiTables.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(ITSclsMap, itsClsMap, uint8_t);
DECLARE_SOA_COLUMN(TPCnCls, tpcNCls, uint8_t);
DECLARE_SOA_COLUMN(TPCnClsShared, tpcNClsShared, uint8_t);
Expand All @@ -56,8 +56,11 @@
DECLARE_SOA_COLUMN(McProcess, mcProcess, uint64_t);
DECLARE_SOA_COLUMN(gEventMask, genEventMask, uint8_t);

DECLARE_SOA_COLUMN(NsigmaTpc, nsigmaTpc, uint8_t);
DECLARE_SOA_COLUMN(NsigmaTof, nsigmaTof, uint8_t);
DECLARE_SOA_COLUMN(NsigmaTpc, nsigmaTpc, float);
DECLARE_SOA_COLUMN(NsigmaTof, nsigmaTof, float);

DECLARE_SOA_COLUMN(Vx, vx, float);
DECLARE_SOA_COLUMN(Vy, vy, float);

} // namespace NucleiTableNS

Expand Down Expand Up @@ -245,6 +248,10 @@
DECLARE_SOA_TABLE(NucleiTableExt, "AOD", "NUCLEITABLEEXT",
NucleiTableNS::NsigmaTpc,
NucleiTableNS::NsigmaTof);
// Extended table for studies on nuclei from material
DECLARE_SOA_TABLE(NucleiTableMat, "AOD", "NUCLEITABLEMAT",
NucleiTableNS::Vx,
NucleiTableNS::Vy);

} // namespace o2::aod

Expand Down
17 changes: 16 additions & 1 deletion PWGLF/TableProducer/QC/nucleiQC.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ struct nucleiQC {
std::array<bool, nuclei::Species::kNspecies> mFillSpecies{false};
Produces<aod::NucleiTableRed> mNucleiTableRed;
Produces<aod::NucleiTableExt> mNucleiTableExt;
Produces<aod::NucleiTableMat> mNucleiTableMat;

std::vector<nuclei::SlimCandidate> mNucleiCandidates;
std::vector<int> mFilledMcParticleIds;
Expand Down Expand Up @@ -209,6 +210,7 @@ struct nucleiQC {

nuclei::createHistogramRegistryNucleus<kSpeciesCt>(mHistograms);
mHistograms.add(fmt::format("{}/hTrackQuality", nuclei::cNames[kSpeciesRt]).c_str(), (fmt::format("{} track quality;", nuclei::cNames[kSpeciesRt]) + std::string("#it{p}_{T} / #it{Z} (GeV/#it{c}); Selection step; Counts")).c_str(), o2::framework::HistType::kTH2D, {{400, -10.0f, 10.0f}, {trackQuality::kNtrackQuality, -0.5f, static_cast<float>(trackQuality::kNtrackQuality) - 0.5f}});
mHistograms.add(fmt::format("{}/h2Productionvertex", nuclei::cNames[kSpeciesRt]).c_str(), (fmt::format("{} production vertex;", nuclei::cNames[kSpeciesRt]) + std::string("#it{x} (cm); #it{y} (cm); Counts")).c_str(), o2::framework::HistType::kTH2D, {{400, -100.0f, 100.0f}, {400, -100.0f, 100.0f}});
for (size_t iSel = 0; iSel < trackQuality::kNtrackQuality; iSel++) {
mHistograms.get<TH2>(HIST(nuclei::cNames[kSpeciesRt]) + HIST("/hTrackQuality"))->GetYaxis()->SetBinLabel(iSel + 1, trackQualityLabels[iSel].c_str());
}
Expand Down Expand Up @@ -383,6 +385,14 @@ struct nucleiQC {
candidate.flags |= nuclei::QcFlags::kQcIsSecondaryFromWeakDecay;
} else {
candidate.flags |= nuclei::QcFlags::kQcIsSecondaryFromMaterial;
static_for<0, nuclei::kNspecies - 1>([&](auto iSpeciesCtV) {
constexpr int kSpeciesCt = decltype(iSpeciesCtV)::value;
if (nuclei::getSpeciesFromPdg(particle.pdgCode()) == kSpeciesCt) {
mHistograms.fill(HIST(nuclei::cNames[kSpeciesCt]) + HIST("/h2Productionvertex"), particle.vx(), particle.vy());
}
candidate.vx = particle.vx();
candidate.vy = particle.vy();
});
}
}

Expand Down Expand Up @@ -443,7 +453,9 @@ struct nucleiQC {
.centrality = nuclei::getCentrality(collision, cfgCentralityEstimator, mHistFailCentrality),
.mcProcess = TMCProcess::kPNoProcess,
.nsigmaTpc = mPidManagers[iSpecies].getNSigmaTPC(track),
.nsigmaTof = mPidManagers[iSpecies].getNSigmaTOF(track)};
.nsigmaTof = mPidManagers[iSpecies].getNSigmaTOF(track),
.vx = -999.f,
.vy = -999.f};

fillNucleusFlagsPdgs(collision, track, candidate);

Expand Down Expand Up @@ -527,6 +539,9 @@ struct nucleiQC {
mNucleiTableExt(
candidate.nsigmaTpc,
candidate.nsigmaTof);
mNucleiTableMat(
candidate.vx,
candidate.vy);
}

void processMc(const Collisions& collisions, const TrackCandidatesMC& tracks, const aod::BCsWithTimestamps&, const aod::McParticles& mcParticles, const aod::McCollisions& /*mcCollisions*/)
Expand Down
2 changes: 2 additions & 0 deletions PWGLF/Utils/nucleiUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ struct SlimCandidate {
uint64_t mcProcess = TMCProcess::kPNoProcess;
float nsigmaTpc = -999.f;
float nsigmaTof = -999.f;
float vx = -999.f; // production vertex x coordinate
float vy = -999.f;
};

enum Species {
Expand Down
Loading