Skip to content

Commit 45e2dbd

Browse files
EloviyoShirajum Monira
andauthored
[PWGCF] FemtoUniverse Cascade Task - renamed cascade V0Child to resolve histogram naming conflict (#13786)
Co-authored-by: Shirajum Monira <shirajum.monira@cernch>
1 parent 99ce1fd commit 45e2dbd

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,11 @@ void FemtoUniverseCascadeSelection::init(HistogramRegistry* registry)
317317
"container - quitting!";
318318
}
319319

320-
posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
320+
posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
321321
aod::femtouniverseparticle::TrackType::kPosChild,
322322
aod::femtouniverseparticle::CutContainerType>(
323323
mHistogramRegistry);
324-
negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
324+
negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
325325
aod::femtouniverseparticle::TrackType::kNegChild,
326326
aod::femtouniverseparticle::CutContainerType>(
327327
mHistogramRegistry);
@@ -580,9 +580,9 @@ void FemtoUniverseCascadeSelection::fillCascadeQA(Col const& col, Casc const& ca
580580
template <typename Col, typename Casc, typename Track>
581581
void FemtoUniverseCascadeSelection::fillQA(Col const& /*col*/, Casc const& /*cascade*/, Track const& posTrack, Track const& negTrack, Track const& bachTrack)
582582
{
583-
posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
583+
posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
584584
aod::femtouniverseparticle::TrackType::kPosChild>(posTrack);
585-
negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
585+
negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
586586
aod::femtouniverseparticle::TrackType::kNegChild>(negTrack);
587587
bachTrackSel.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeBachelor,
588588
aod::femtouniverseparticle::TrackType::kBachelor>(bachTrack);

PWGCF/FemtoUniverse/DataModel/FemtoDerived.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@
1616
#ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
1717
#define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
1818

19-
#include <cmath>
20-
#include "Framework/ASoA.h"
21-
#include "MathUtils/Utils.h"
22-
#include "Framework/DataTypes.h"
2319
#include "Common/DataModel/Multiplicity.h"
20+
#include "Common/DataModel/PIDResponse.h"
21+
#include "Common/DataModel/TrackSelectionTables.h"
22+
23+
#include "Framework/ASoA.h"
2424
#include "Framework/AnalysisDataModel.h"
25+
#include "Framework/DataTypes.h"
2526
#include "Framework/Expressions.h"
26-
#include "Common/DataModel/TrackSelectionTables.h"
27-
#include "Common/DataModel/PIDResponse.h"
27+
#include "MathUtils/Utils.h"
28+
29+
#include <cmath>
2830

2931
namespace o2::aod
3032
{
@@ -64,6 +66,7 @@ enum ParticleType {
6466
kV0, //! V0
6567
kV0Child, //! Child track of a V0
6668
kCascade, //! Cascade
69+
kCascadeV0Child, //! Child track of a V0 coming from a cascade
6770
kCascadeBachelor, //! Bachelor track of a cascade
6871
kPhi, //! Phi meson
6972
kPhiChild, //! Child track of a Phi meson
@@ -72,7 +75,7 @@ enum ParticleType {
7275
kNParticleTypes //! Number of particle types
7376
};
7477

75-
static constexpr std::string_view ParticleTypeName[kNParticleTypes] = {"Tracks", "MCTruthTracks", "V0", "V0Child", "Cascade", "CascadeBachelor", "Phi", "PhiChild", "D0", "D0Child"}; //! Naming of the different particle types
78+
static constexpr std::string_view ParticleTypeName[kNParticleTypes] = {"Tracks", "MCTruthTracks", "V0", "V0Child", "Cascade", "CascadeV0Child,", "CascadeBachelor", "Phi", "PhiChild", "D0", "D0Child"}; //! Naming of the different particle types
7679
static constexpr std::string_view TempFitVarName[kNParticleTypes] = {"/hDCAxy", "/hPDGvspT", "/hCPA", "/hDCAxy", "/hCPA", "/hDCAxy", "/hInvMass", "/hDCAxy", "/hInvMass", "/hDCAxy"};
7780

7881
using CutContainerType = uint32_t; //! Definition of the data type for the bit-wise container for the different selection criteria

0 commit comments

Comments
 (0)