Skip to content
Merged
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
12 changes: 9 additions & 3 deletions PWGCF/DataModel/FemtoDerived.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@

using BitMaskType = uint32_t; //! Definition of the data type for the collision masks

DECLARE_SOA_COLUMN(BitMaskTrackOne, bitmaskTrackOne, BitMaskType); //! Bit for track one

Check failure on line 48 in PWGCF/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(BitMaskTrackTwo, bitmaskTrackTwo, BitMaskType); //! Bit for track two

Check failure on line 49 in PWGCF/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(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit for track three

Check failure on line 50 in PWGCF/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(Downsample, downsample, bool); //! Flag for downsampling

Expand Down Expand Up @@ -92,7 +92,7 @@

namespace mcfdcolllabel
{
DECLARE_SOA_INDEX_COLUMN(FDMCCollision, fdMCCollision); //! MC collision for femtodreamcollision

Check failure on line 95 in PWGCF/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_TABLE_STAGED(FDMCCollLabels, "FDMCCollLabel", mcfdcolllabel::FDMCCollisionId);

Expand Down Expand Up @@ -154,13 +154,13 @@

static constexpr std::string_view TrackTypeName[kNTrackTypes] = {"Trk", "Pos", "Neg", "Bach"}; //! Naming of the different particle types

DECLARE_SOA_INDEX_COLUMN(FDCollision, fdCollision);

Check failure on line 157 in PWGCF/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(Pt, pt, float); //! p_T (GeV/c)
DECLARE_SOA_COLUMN(Eta, eta, float); //! Eta
DECLARE_SOA_COLUMN(Phi, phi, float); //! Phi
DECLARE_SOA_COLUMN(PartType, partType, uint8_t); //! Type of the particle, according to femtodreamparticle::ParticleType
DECLARE_SOA_COLUMN(Cut, cut, cutContainerType); //! Bit-wise container for the different selection criteria
DECLARE_SOA_COLUMN(PIDCut, pidcut, cutContainerType); //! Bit-wise container for the different PID selection criteria \todo since bit-masking cannot be done yet with filters we use a second field for the PID

Check failure on line 163 in PWGCF/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(TempFitVar, tempFitVar, float); //! Observable for the template fitting (Track: DCA_xy, V0: CPA)
DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Children, children); //! Field for the track indices to remove auto-correlations
DECLARE_SOA_COLUMN(MLambda, mLambda, float); //! The invariant mass of V0 candidate, assuming lambda
Expand Down Expand Up @@ -188,10 +188,10 @@
});
// debug variables
DECLARE_SOA_COLUMN(Sign, sign, int8_t); //! Sign of the track charge
DECLARE_SOA_COLUMN(TPCNClsFound, tpcNClsFound, uint8_t); //! Number of TPC clusters

Check failure on line 191 in PWGCF/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(TPCNClsCrossedRows, tpcNClsCrossedRows, uint8_t); //! Number of TPC crossed rows

Check failure on line 192 in PWGCF/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(ITSNCls, itsNCls, uint8_t); //! Number of ITS clusters

Check failure on line 193 in PWGCF/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(ITSNClsInnerBarrel, itsNClsInnerBarrel, uint8_t); //! Number of ITS clusters in the inner barrel //! TPC signal

Check failure on line 194 in PWGCF/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_DYNAMIC_COLUMN(TPCCrossedRowsOverFindableCls, tpcCrossedRowsOverFindableCls, //! Compute the number of crossed rows over findable TPC clusters
[](uint8_t tpcNClsFindable, uint8_t tpcNClsCrossedRows) -> float {
return (float)tpcNClsCrossedRows / (float)tpcNClsFindable;
Expand Down Expand Up @@ -567,7 +567,9 @@
fdhf::Charge,
fdhf::BDTBkg,
fdhf::BDTPrompt,
fdhf::BDTFD);
fdhf::BDTFD,
fdhf::FlagMc,
fdhf::OriginMcRec);

DECLARE_SOA_TABLE(FDHfCharm2Prong, "AOD", "FDHFCHARM2PRONG", //! table to store results for HF femtoscopy
fdhf::GIndexCol,
Expand All @@ -581,7 +583,9 @@
fdhf::Charge,
fdhf::BDTBkg,
fdhf::BDTPrompt,
fdhf::BDTFD);
fdhf::BDTFD,
fdhf::FlagMc,
fdhf::OriginMcRec);

DECLARE_SOA_TABLE(FDHfCharmDstar, "AOD", "FDHFCHARMDSTAR", //! table to store results for HF femtoscopy
fdhf::GIndexCol,
Expand All @@ -597,7 +601,9 @@
fdhf::Charge,
fdhf::BDTBkg,
fdhf::BDTPrompt,
fdhf::BDTFD);
fdhf::BDTFD,
fdhf::FlagMc,
fdhf::OriginMcRec);

DECLARE_SOA_TABLE(FDHfTrk, "AOD", "FDHFTRK", //! table to store results for HF femtoscopy
fdhf::GIndexCol,
Expand Down
23 changes: 19 additions & 4 deletions PWGHF/HFC/Tasks/taskCharmHadronsTrackFemtoDream.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,13 @@ struct HfTaskCharmHadronsTrackFemtoDream {

timeStamp = part.timeStamp();

int charmHadMc = 0;
int originType = 0;
if constexpr (IsMc) {
charmHadMc = part.flagMc();
originType = part.originMcRec();
}

if constexpr (Channel == DecayChannel::DplusToPiKPi || Channel == DecayChannel::LcToPKPi) {

rowFemtoResultCharm3Prong(
Expand All @@ -783,7 +790,9 @@ struct HfTaskCharmHadronsTrackFemtoDream {
part.charge(),
part.bdtBkg(),
part.bdtPrompt(),
part.bdtFD());
part.bdtFD(),
charmHadMc,
originType);
} else if constexpr (Channel == DecayChannel::XicToXiPiPi) {
rowFemtoResultCharm3Prong(
col.globalIndex(),
Expand All @@ -798,7 +807,9 @@ struct HfTaskCharmHadronsTrackFemtoDream {
part.charge(),
part.bdtBkg(),
part.bdtPrompt(),
part.bdtFD());
part.bdtFD(),
charmHadMc,
originType);
} else if constexpr (Channel == DecayChannel::D0ToPiK) {
rowFemtoResultCharm2Prong(
col.globalIndex(),
Expand All @@ -812,7 +823,9 @@ struct HfTaskCharmHadronsTrackFemtoDream {
part.charge(),
part.bdtBkg(),
part.bdtPrompt(),
part.bdtFD());
part.bdtFD(),
charmHadMc,
originType);
} else if constexpr (Channel == DecayChannel::DstarToD0Pi) {
float invMassD0 = getCharmHadronMass<Channel>(part, true);
rowFemtoResultCharmDstar(
Expand All @@ -829,7 +842,9 @@ struct HfTaskCharmHadronsTrackFemtoDream {
part.charge(),
part.bdtBkg(),
part.bdtPrompt(),
part.bdtFD());
part.bdtFD(),
charmHadMc,
originType);
}
}
// ---- Fill Track Table ----
Expand Down
19 changes: 16 additions & 3 deletions PWGHF/HFC/Tasks/taskCharmHadronsV0FemtoDream.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,13 @@ struct HfTaskCharmHadronsV0FemtoDream {
registryCharmHadronQa.fill(HIST("CharmHadronQA/hPtVsMass"), part.pt(), invMass);
timeStamp = part.timeStamp();

int charmHadMc = 0;
int originType = 0;
if constexpr (IsMc) {
charmHadMc = part.flagMc();
originType = part.originMcRec();
}

if constexpr (Channel == DecayChannel::DplusToPiKPi || Channel == DecayChannel::LcToPKPi) {

rowFemtoResultCharm3Prong(
Expand All @@ -642,7 +649,9 @@ struct HfTaskCharmHadronsV0FemtoDream {
part.charge(),
part.bdtBkg(),
part.bdtPrompt(),
part.bdtFD());
part.bdtFD(),
charmHadMc,
originType);
} else if constexpr (Channel == DecayChannel::D0ToPiK) {
rowFemtoResultCharm2Prong(
col.globalIndex(),
Expand All @@ -656,7 +665,9 @@ struct HfTaskCharmHadronsV0FemtoDream {
part.charge(),
part.bdtBkg(),
part.bdtPrompt(),
part.bdtFD());
part.bdtFD(),
charmHadMc,
originType);
} else if constexpr (Channel == DecayChannel::DstarToD0Pi) {
float invMassD0 = getCharmHadronMass<Channel>(part, true);
rowFemtoResultCharmDstar(
Expand All @@ -673,7 +684,9 @@ struct HfTaskCharmHadronsV0FemtoDream {
part.charge(),
part.bdtBkg(),
part.bdtPrompt(),
part.bdtFD());
part.bdtFD(),
charmHadMc,
originType);
}
}

Expand Down
Loading