Skip to content

Commit 36f0838

Browse files
BongHwiBongHwi
authored
[PWGLF] Resonance Table - Update table descriptions (AliceO2Group#10335)
1 parent 8395f27 commit 36f0838

File tree

3 files changed

+24
-36
lines changed

3 files changed

+24
-36
lines changed

‎PWGLF/DataModel/LFResonanceTables.h‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
///
1717
/// \author Bong-Hwi Lim <[email protected]>
1818
/// \author Nasir Mehdi Malik <[email protected]>
19+
/// \author Minjae Kim <[email protected]>
1920
///
2021

2122
#ifndef PWGLF_DATAMODEL_LFRESONANCETABLES_H_
@@ -72,7 +73,7 @@ DECLARE_SOA_COLUMN(IsInAfterAllCuts, isInAfterAllCuts, bool); //! InAfterAllCuts
7273
DECLARE_SOA_COLUMN(ImpactParameter, impactParameter, float); //! ImpactParameter
7374

7475
} // namespace resocollision
75-
DECLARE_SOA_TABLE(ResoCollisions, "AOD", "RESOCOLLISIONS",
76+
DECLARE_SOA_TABLE(ResoCollisions, "AOD", "RESOCOLLISION",
7677
o2::soa::Index<>,
7778
resocollision::CollisionId,
7879
o2::aod::mult::MultNTracksPV,
@@ -90,7 +91,7 @@ DECLARE_SOA_TABLE(ResoCollisions, "AOD", "RESOCOLLISIONS",
9091
evsel::NumTracksInTimeRange);
9192
using ResoCollision = ResoCollisions::iterator;
9293

93-
DECLARE_SOA_TABLE(ResoMCCollisions, "AOD", "RESOMCCOLLISIONS",
94+
DECLARE_SOA_TABLE(ResoMCCollisions, "AOD", "RESOMCCOLLISION",
9495
o2::soa::Index<>,
9596
resocollision::IsVtxIn10,
9697
resocollision::IsINELgt0,
@@ -100,13 +101,13 @@ DECLARE_SOA_TABLE(ResoMCCollisions, "AOD", "RESOMCCOLLISIONS",
100101
resocollision::ImpactParameter);
101102
using ResoMCCollision = ResoMCCollisions::iterator;
102103

103-
DECLARE_SOA_TABLE(ResoSpheroCollisions, "AOD", "RESOSPHEROCOLLISIONS",
104+
DECLARE_SOA_TABLE(ResoSpheroCollisions, "AOD", "RESOSPHEROCOLLISION",
104105
o2::soa::Index<>,
105106
resocollision::CollisionId,
106107
resocollision::Spherocity);
107108
using ResoSpheroCollision = ResoSpheroCollisions::iterator;
108109

109-
DECLARE_SOA_TABLE(ResoEvtPlCollisions, "AOD", "RESOEVTPLCOLLISIONS",
110+
DECLARE_SOA_TABLE(ResoEvtPlCollisions, "AOD", "RESOEVTPLCOLLISION",
110111
o2::soa::Index<>,
111112
resocollision::CollisionId,
112113
resocollision::EvtPl,
@@ -116,7 +117,7 @@ DECLARE_SOA_TABLE(ResoEvtPlCollisions, "AOD", "RESOEVTPLCOLLISIONS",
116117
using ResoEvtPlCollision = ResoEvtPlCollisions::iterator;
117118

118119
// For DF mixing study
119-
DECLARE_SOA_TABLE(ResoCollisionDFs, "AOD", "RESOCOLLISIONDFS",
120+
DECLARE_SOA_TABLE(ResoCollisionDFs, "AOD", "RESOCOLLISIONDF",
120121
o2::soa::Index<>,
121122
// resocollision::CollisionId,
122123
o2::aod::mult::MultNTracksPV,
@@ -155,8 +156,8 @@ DECLARE_SOA_COLUMN(TempFitVar, tempFitVar, float); //!
155156
DECLARE_SOA_COLUMN(Indices, indices, int[2]); //! Field for the track indices to remove auto-correlations
156157
DECLARE_SOA_COLUMN(CascadeIndices, cascadeIndices, int[3]); //! Field for the track indices to remove auto-correlations (ordered: positive, negative, bachelor)
157158
DECLARE_SOA_COLUMN(Sign, sign, int8_t); //! Sign of the track charge
158-
DECLARE_SOA_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, uint8_t); //! Number of TPC crossed rows
159-
DECLARE_SOA_COLUMN(TPCNClsFound, tpcNClsFound, uint8_t); //! Number of TPC clusters found
159+
DECLARE_SOA_COLUMN(TpcNClsCrossedRows, tpcNClsCrossedRows, uint8_t); //! Number of TPC crossed rows
160+
DECLARE_SOA_COLUMN(TpcNClsFound, tpcNClsFound, uint8_t); //! Number of TPC clusters found
160161
DECLARE_SOA_COLUMN(IsGlobalTrackWoDCA, isGlobalTrackWoDCA, bool); //! Is global track without DCA
161162
DECLARE_SOA_COLUMN(IsGlobalTrack, isGlobalTrack, bool); //! Is global track
162163
DECLARE_SOA_COLUMN(IsPrimaryTrack, isPrimaryTrack, bool); //! Is primary track
@@ -239,7 +240,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaPr, tofNSigmaPr,
239240
return (float)tofNSigmaPr10 / 10.f;
240241
});
241242
} // namespace resodaughter
242-
DECLARE_SOA_TABLE(ResoTracks, "AOD", "RESOTRACKS",
243+
DECLARE_SOA_TABLE(ResoTracks, "AOD", "RESOTRACK",
243244
o2::soa::Index<>,
244245
resodaughter::ResoCollisionId,
245246
resodaughter::TrackId,
@@ -250,8 +251,8 @@ DECLARE_SOA_TABLE(ResoTracks, "AOD", "RESOTRACKS",
250251
resodaughter::Eta,
251252
resodaughter::Phi,
252253
resodaughter::Sign,
253-
resodaughter::TPCNClsCrossedRows,
254-
resodaughter::TPCNClsFound,
254+
resodaughter::TpcNClsCrossedRows,
255+
resodaughter::TpcNClsFound,
255256
o2::aod::track::DcaXY,
256257
o2::aod::track::DcaZ,
257258
resodaughter::HasTOF,
@@ -278,7 +279,7 @@ DECLARE_SOA_TABLE(ResoTracks, "AOD", "RESOTRACKS",
278279
using ResoTrack = ResoTracks::iterator;
279280

280281
// For DF mixing study
281-
DECLARE_SOA_TABLE(ResoTrackDFs, "AOD", "RESOTRACKDFS",
282+
DECLARE_SOA_TABLE(ResoTrackDFs, "AOD", "RESOTRACKDF",
282283
o2::soa::Index<>,
283284
resodaughter::ResoCollisionDFId,
284285
// resodaughter::TrackId,
@@ -289,8 +290,8 @@ DECLARE_SOA_TABLE(ResoTrackDFs, "AOD", "RESOTRACKDFS",
289290
resodaughter::Eta,
290291
resodaughter::Phi,
291292
resodaughter::Sign,
292-
resodaughter::TPCNClsCrossedRows,
293-
resodaughter::TPCNClsFound,
293+
resodaughter::TpcNClsCrossedRows,
294+
resodaughter::TpcNClsFound,
294295
o2::aod::track::DcaXY,
295296
o2::aod::track::DcaZ,
296297
resodaughter::HasTOF,
@@ -316,7 +317,7 @@ DECLARE_SOA_TABLE(ResoTrackDFs, "AOD", "RESOTRACKDFS",
316317
resodaughter::TofNSigmaPr<resodaughter::TofNSigmaPr10>);
317318
using ResoTrackDF = ResoTrackDFs::iterator;
318319

319-
DECLARE_SOA_TABLE(ResoV0s, "AOD", "RESOV0S",
320+
DECLARE_SOA_TABLE(ResoV0s, "AOD", "RESOV0",
320321
o2::soa::Index<>,
321322
resodaughter::ResoCollisionId,
322323
resodaughter::V0Id,
@@ -353,7 +354,7 @@ DECLARE_SOA_TABLE(ResoV0s, "AOD", "RESOV0S",
353354
resodaughter::DecayVtxZ);
354355
using ResoV0 = ResoV0s::iterator;
355356

356-
DECLARE_SOA_TABLE(ResoCascades, "AOD", "RESOCASCADES",
357+
DECLARE_SOA_TABLE(ResoCascades, "AOD", "RESOCASCADE",
357358
o2::soa::Index<>,
358359
resodaughter::ResoCollisionId,
359360
resodaughter::CascadeId,
@@ -402,7 +403,7 @@ DECLARE_SOA_TABLE(ResoCascades, "AOD", "RESOCASCADES",
402403
resodaughter::DecayVtxZ);
403404
using ResoCascade = ResoCascades::iterator;
404405

405-
DECLARE_SOA_TABLE(ResoCascadeDFs, "AOD", "RESOCASCADEDFS",
406+
DECLARE_SOA_TABLE(ResoCascadeDFs, "AOD", "RESOCASCADEDF",
406407
o2::soa::Index<>,
407408
resodaughter::ResoCollisionDFId,
408409
// resodaughter::CascadeId,
@@ -451,7 +452,7 @@ DECLARE_SOA_TABLE(ResoCascadeDFs, "AOD", "RESOCASCADEDFS",
451452
resodaughter::DecayVtxZ);
452453
using ResoCascadeDF = ResoCascadeDFs::iterator;
453454

454-
DECLARE_SOA_TABLE(ResoMCTracks, "AOD", "RESOMCTRACKS",
455+
DECLARE_SOA_TABLE(ResoMCTracks, "AOD", "RESOMCTRACK",
455456
mcparticle::PdgCode,
456457
resodaughter::MotherId,
457458
resodaughter::MotherPDG,
@@ -460,7 +461,7 @@ DECLARE_SOA_TABLE(ResoMCTracks, "AOD", "RESOMCTRACKS",
460461
resodaughter::ProducedByGenerator);
461462
using ResoMCTrack = ResoMCTracks::iterator;
462463

463-
DECLARE_SOA_TABLE(ResoMCV0s, "AOD", "RESOMCV0S",
464+
DECLARE_SOA_TABLE(ResoMCV0s, "AOD", "RESOMCV0",
464465
mcparticle::PdgCode,
465466
resodaughter::MotherId,
466467
resodaughter::MotherPDG,
@@ -472,7 +473,7 @@ DECLARE_SOA_TABLE(ResoMCV0s, "AOD", "RESOMCV0S",
472473
resodaughter::ProducedByGenerator);
473474
using ResoMCV0 = ResoMCV0s::iterator;
474475

475-
DECLARE_SOA_TABLE(ResoMCCascades, "AOD", "RESOMCCASCADES",
476+
DECLARE_SOA_TABLE(ResoMCCascades, "AOD", "RESOMCCASCADE",
476477
mcparticle::PdgCode,
477478
resodaughter::MotherId,
478479
resodaughter::MotherPDG,
@@ -484,7 +485,7 @@ DECLARE_SOA_TABLE(ResoMCCascades, "AOD", "RESOMCCASCADES",
484485
resodaughter::ProducedByGenerator);
485486
using ResoMCCascade = ResoMCCascades::iterator;
486487

487-
DECLARE_SOA_TABLE(ResoMCParents, "AOD", "RESOMCPARENTS",
488+
DECLARE_SOA_TABLE(ResoMCParents, "AOD", "RESOMCPARENT",
488489
o2::soa::Index<>,
489490
resodaughter::ResoCollisionId,
490491
resodaughter::McParticleId,
@@ -509,7 +510,7 @@ using Reso2TracksMC = soa::Join<aod::FullTracks, McTrackLabels>;
509510
using Reso2TracksPID = soa::Join<aod::FullTracks, aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr, aod::pidTOFPi, aod::pidTOFKa, aod::pidTOFPr>;
510511
using Reso2TracksPIDExt = soa::Join<Reso2TracksPID, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension>; // Without Extra
511512

512-
using ResoCollisionCandidates = soa::Join<aod::Collisions, aod::EvSels, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::Mults>;
513+
using ResoCollisionCandidates = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::Mults>;
513514
using ResoRun2CollisionCandidates = soa::Join<aod::Collisions, aod::EvSels, aod::CentRun2V0Ms>;
514515
using ResoCollisionCandidatesMC = soa::Join<ResoCollisionCandidates, aod::McCollisionLabels>;
515516
using ResoRun2CollisionCandidatesMC = soa::Join<ResoRun2CollisionCandidates, aod::McCollisionLabels>;

‎PWGLF/TableProducer/Resonances/resonanceInitializer.cxx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ struct ResonanceInitializer {
220220
|| (nabs(aod::mcparticle::pdgCode) == 123314) // Xi(1820)0
221221
|| (nabs(aod::mcparticle::pdgCode) == 123324); // Xi(1820)-0
222222

223-
using ResoEvents = soa::Join<aod::Collisions, aod::EvSels, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::Mults>;
223+
using ResoEvents = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs, aod::CentFT0As, aod::Mults>;
224224
using ResoRun2Events = soa::Join<aod::Collisions, aod::EvSels, aod::CentRun2V0Ms>;
225225
using ResoEventsMC = soa::Join<ResoEvents, aod::McCollisionLabels>;
226226
using ResoRun2EventsMC = soa::Join<ResoEvents, aod::McCollisionLabels>;
@@ -510,9 +510,6 @@ struct ResonanceInitializer {
510510
case 2:
511511
returnValue = ResoEvents.centFT0A();
512512
break;
513-
case 99:
514-
returnValue = ResoEvents.centFV0A();
515-
break;
516513
default:
517514
returnValue = ResoEvents.centFT0M();
518515
break;

‎PWGLF/TableProducer/Resonances/resonanceModuleInitializer.cxx‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ struct ResonanceModuleInitializer {
139139
multEstimator = 1;
140140
} else if (cfgMultName.value == "FT0A") {
141141
multEstimator = 2;
142-
} else if (cfgMultName.value == "FV0A") {
143-
multEstimator = 99;
144142
}
145143
LOGF(info, "Mult estimator: %d, %s", multEstimator, cfgMultName.value.c_str());
146144

@@ -278,7 +276,7 @@ struct ResonanceModuleInitializer {
278276
break;
279277
case 1:
280278
if constexpr (isMC) {
281-
LOG(fatal) << "CentFV0A is not available for MC";
279+
LOG(fatal) << "CentFT0C is not available for MC";
282280
return returnValue;
283281
} else {
284282
returnValue = ResoEvents.centFT0C();
@@ -292,14 +290,6 @@ struct ResonanceModuleInitializer {
292290
returnValue = ResoEvents.centFT0A();
293291
break;
294292
}
295-
case 99:
296-
if constexpr (isMC) {
297-
LOG(fatal) << "CentFV0A is not available for MC";
298-
return returnValue;
299-
} else {
300-
returnValue = ResoEvents.centFV0A();
301-
break;
302-
}
303293
default:
304294
returnValue = ResoEvents.centFT0M();
305295
break;

0 commit comments

Comments
 (0)