Skip to content

Commit e8a294b

Browse files
committed
Restore centrEstimator configurable for FT0C and FT0M
1 parent 62193a4 commit e8a294b

File tree

1 file changed

+32
-29
lines changed

1 file changed

+32
-29
lines changed

PWGLF/Tasks/Strangeness/strangenessInJetsIons.cxx

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ using SelCollisions = soa::Join<aod::Collisions,
8282
aod::CentFT0Ms>;
8383
using SimCollisions = soa::Join<aod::McCollisionLabels,
8484
aod::Collisions,
85-
aod::EvSels,
86-
aod::CentFT0Cs,
87-
aod::CentFT0Ms>;
85+
aod::EvSels>;
8886
using DaughterTracks = soa::Join<aod::Tracks, aod::TracksIU, aod::TracksExtra, aod::TracksCovIU, aod::TracksDCA,
8987
aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr,
9088
aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr>;
@@ -127,7 +125,7 @@ struct StrangenessInJetsIons {
127125
Configurable<double> deltaEtaEdge{"deltaEtaEdge", 0.05, "eta gap from detector edge"};
128126
Configurable<bool> cfgSkimmedProcessing{"cfgSkimmedProcessing", false, "Enable processing of skimmed data"};
129127
Configurable<std::string> triggerName{"triggerName", "fOmega", "Software trigger name"};
130-
// Configurable<int> centrEstimator{"centrEstimator", 1, "Select centrality estimator. Options: 0 = FT0C, 1 = FT0M. CCDB objects available only for FT0M."};
128+
Configurable<int> centrEstimator{"centrEstimator", 1, "Select centrality estimator. Options: 0 = FT0C, 1 = FT0M. CCDB objects available only for FT0M."};
131129

132130
// Event selection
133131
Configurable<bool> requireNoSameBunchPileup{"requireNoSameBunchPileup", true, "Require kNoSameBunchPileup selection"};
@@ -217,14 +215,15 @@ struct StrangenessInJetsIons {
217215
}
218216

219217
// Define binning and axis specifications for multiplicity, eta, pT, PID, and invariant mass histograms
220-
std::string multAxTitle = "FT0M percentile";
221-
// if (centrEstimator == 0) {
222-
// multAxTitle = "FT0C percentile";
223-
// } else if (centrEstimator == 1) {
224-
// multAxTitle = "FT0M percentile";
225-
// } else {
226-
// LOG(fatal) << "Centrality estimator " << centrEstimator << " not available. Exit." << endl;
227-
// }
218+
std::string multAxTitle;
219+
if (centrEstimator == 0) {
220+
multAxTitle = "FT0C percentile";
221+
LOG(warning) << "FT0C ccdb object not available yet." << endl;
222+
} else if (centrEstimator == 1) {
223+
multAxTitle = "FT0M percentile";
224+
} else {
225+
LOG(fatal) << "Centrality estimator " << centrEstimator << " not available. Exit." << endl;
226+
}
228227
AxisSpec multAxis = {multBinning, multAxTitle};
229228

230229
const AxisSpec ptAxis{100, 0.0, 10.0, "#it{p}_{T} (GeV/#it{c})"};
@@ -1169,12 +1168,12 @@ struct StrangenessInJetsIons {
11691168
registryData.fill(HIST("number_of_events_data"), 7.5);
11701169

11711170
// Event multiplicity
1172-
float multiplicity = collision.centFT0M();
1173-
// if (centrEstimator == 0) {
1174-
// multiplicity = collision.centFT0C();
1175-
// } else {
1176-
// multiplicity = collision.centFT0M();
1177-
// }
1171+
float multiplicity;
1172+
if (centrEstimator == 0) {
1173+
multiplicity = collision.centFT0C();
1174+
} else {
1175+
multiplicity = collision.centFT0M();
1176+
}
11781177

11791178
// Fill event multiplicity
11801179
registryData.fill(HIST("number_of_events_vsmultiplicity"), multiplicity);
@@ -1356,7 +1355,7 @@ struct StrangenessInJetsIons {
13561355
Preslice<aod::McParticles> perMCCollision = o2::aod::mcparticle::mcCollisionId;
13571356
Preslice<DaughterTracksMC> perCollisionTrk = o2::aod::track::collisionId;
13581357

1359-
void processMCgenerated(soa::Join<aod::McCollisions, aod::McCentFT0Ms> const& collisions,
1358+
void processMCgenerated(soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::McCentFT0Cs> const& collisions,
13601359
aod::McParticles const& mcParticles)
13611360
{
13621361
// Define per-event particle containers
@@ -1418,12 +1417,12 @@ struct StrangenessInJetsIons {
14181417
// float genMultiplicity = multiplicity;
14191418

14201419
// Multiplicity of generated event
1421-
double genMultiplicity = collision.centFT0M();
1422-
// if (centrEstimator == 0) {
1423-
// genMultiplicity = collision.centFT0C();
1424-
// } else {
1425-
// genMultiplicity = collision.centFT0M();
1426-
// }
1420+
float genMultiplicity;
1421+
if (centrEstimator == 0) {
1422+
genMultiplicity = collision.centFT0C();
1423+
} else {
1424+
genMultiplicity = collision.centFT0M();
1425+
}
14271426

14281427
// MC particles per collision
14291428
auto mcParticlesPerColl = mcParticles.sliceBy(perMCCollision, collision.globalIndex());
@@ -1660,7 +1659,7 @@ struct StrangenessInJetsIons {
16601659

16611660
// Reconstructed MC events
16621661
void processMCreconstructed(SimCollisions const& collisions,
1663-
soa::Join<aod::McCollisions, aod::McCentFT0Ms> const&,
1662+
soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::McCentFT0Cs> const&,
16641663
DaughterTracksMC const& mcTracks, aod::V0Datas const& fullV0s,
16651664
aod::CascDataExt const& Cascades, const aod::McParticles&)
16661665
{
@@ -1680,7 +1679,7 @@ struct StrangenessInJetsIons {
16801679
continue;
16811680
}
16821681

1683-
const auto& mcCollision = collision.mcCollision_as<soa::Join<aod::McCollisions, aod::McCentFT0Ms>>();
1682+
const auto& mcCollision = collision.mcCollision_as<soa::Join<aod::McCollisions, aod::McCentFT0Ms, aod::McCentFT0Cs>>();
16841683

16851684
// Clear containers at the start of the event loop
16861685
fjParticles.clear();
@@ -1716,8 +1715,12 @@ struct StrangenessInJetsIons {
17161715
registryMC.fill(HIST("number_of_events_mc_rec"), 4.5);
17171716

17181717
// Event multiplicity
1719-
float multiplicity = mcCollision.centFT0M();
1720-
1718+
float multiplicity;
1719+
if (centrEstimator == 0) {
1720+
multiplicity = mcCollision.centFT0C();
1721+
} else {
1722+
multiplicity = mcCollision.centFT0M();
1723+
}
17211724
// Number of V0 and cascades per collision
17221725
auto v0sPerColl = fullV0s.sliceBy(perCollisionV0, collision.globalIndex());
17231726
auto cascPerColl = Cascades.sliceBy(perCollisionCasc, collision.globalIndex());

0 commit comments

Comments
 (0)