Skip to content

[PWGCF] FemtoUniverse Cascade Task - renamed cascade V0Child to resolve histogram naming conflict #13786

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
prchakra merged 1 commit into from
Nov 12, 2025
Merged

[PWGCF] FemtoUniverse Cascade Task - renamed cascade V0Child to resolve histogram naming conflict #13786

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
8 changes: 4 additions & 4 deletions PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,16 +312,16 @@
/// \todo this should be an automatic check in the parent class, and the
/// return type should be templated
size_t nSelections = getNSelections();
if (nSelections > 17 * sizeof(CutContainerType)) {

Check failure on line 315 in PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOG(fatal) << "FemtoUniverseCascadeCuts: Number of selections to large for your "
"container - quitting!";
}

posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
aod::femtouniverseparticle::TrackType::kPosChild,
aod::femtouniverseparticle::CutContainerType>(
mHistogramRegistry);
negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
aod::femtouniverseparticle::TrackType::kNegChild,
aod::femtouniverseparticle::CutContainerType>(
mHistogramRegistry);
Expand Down Expand Up @@ -580,9 +580,9 @@
template <typename Col, typename Casc, typename Track>
void FemtoUniverseCascadeSelection::fillQA(Col const& /*col*/, Casc const& /*cascade*/, Track const& posTrack, Track const& negTrack, Track const& bachTrack)
{
posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
aod::femtouniverseparticle::TrackType::kPosChild>(posTrack);
negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
aod::femtouniverseparticle::TrackType::kNegChild>(negTrack);
bachTrackSel.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeBachelor,
aod::femtouniverseparticle::TrackType::kBachelor>(bachTrack);
Expand Down
17 changes: 10 additions & 7 deletions PWGCF/FemtoUniverse/DataModel/FemtoDerived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@
#ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
#define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_

#include <cmath>
#include "Framework/ASoA.h"
#include "MathUtils/Utils.h"
#include "Framework/DataTypes.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/PIDResponse.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/ASoA.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/DataTypes.h"
#include "Framework/Expressions.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/PIDResponse.h"
#include "MathUtils/Utils.h"

#include <cmath>

namespace o2::aod
{
Expand Down Expand Up @@ -64,6 +66,7 @@
kV0, //! V0
kV0Child, //! Child track of a V0
kCascade, //! Cascade
kCascadeV0Child, //! Child track of a V0 coming from a cascade
kCascadeBachelor, //! Bachelor track of a cascade
kPhi, //! Phi meson
kPhiChild, //! Child track of a Phi meson
Expand All @@ -72,7 +75,7 @@
kNParticleTypes //! Number of particle types
};

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

using CutContainerType = uint32_t; //! Definition of the data type for the bit-wise container for the different selection criteria
Expand Down Expand Up @@ -162,7 +165,7 @@
/// FemtoUniverseCascadeTrack
namespace femtouniversecascparticle
{
DECLARE_SOA_INDEX_COLUMN(FDParticle, fdParticle);

Check failure on line 168 in PWGCF/FemtoUniverse/DataModel/FemtoDerived.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(DcaV0daughters, dcaV0daughters, float); //! DCA between V0 daughters
DECLARE_SOA_COLUMN(Cpav0, cpav0, float); //! V0 cos of pointing angle
DECLARE_SOA_COLUMN(V0radius, v0radius, float); //! V0 transverse radius
Expand Down
Loading