Skip to content

Please consider the following formatting changes to #9944 #17

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
Yunfan-Liu merged 1 commit into from
Feb 13, 2025
Merged

Please consider the following formatting changes to #9944 #17

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
83 changes: 41 additions & 42 deletions PWGHF/Core/HfMlResponseOmegacToOmegaPi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,41 +28,41 @@
// Fill the map of available input features
// the key is the feature's name (std::string)
// the value is the corresponding value in EnumInputFeatures
#define FILL_MAP_OMEGAC0(FEATURE) \
{ \
#FEATURE, static_cast < uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE) \
#define FILL_MAP_OMEGAC0(FEATURE) \
{ \
#FEATURE, static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE) \
}

// Check if the index of mCachedIndices (index associated to a FEATURE)
// matches the entry in EnumInputFeatures associated to this FEATURE
// if so, the inputFeatures vector is filled with the FEATURE's value
// by calling the corresponding GETTER from OBJECT
#define CHECK_AND_FILL_VEC_OMEGAC0_FULL(OBJECT, FEATURE, GETTER) \
#define CHECK_AND_FILL_VEC_OMEGAC0_FULL(OBJECT, FEATURE, GETTER) \
case static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE): { \
inputFeatures.emplace_back(OBJECT.GETTER()); \
break; \
inputFeatures.emplace_back(OBJECT.GETTER()); \
break; \
}

// Specific case of CHECK_AND_FILL_VEC_OMEGAC0_FULL(OBJECT, FEATURE, GETTER)
// where OBJECT is named candidate and FEATURE = GETTER
#define CHECK_AND_FILL_VEC_OMEGAC0(GETTER) \
#define CHECK_AND_FILL_VEC_OMEGAC0(GETTER) \
case static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::GETTER): { \
inputFeatures.emplace_back(candidate.GETTER()); \
break; \
inputFeatures.emplace_back(candidate.GETTER()); \
break; \
}

// Variation of CHECK_AND_FILL_VEC_OMEGAC0_FULL(OBJECT, FEATURE, GETTER)
// where GETTER is a method of hfHelper
#define CHECK_AND_FILL_VEC_OMEGAC0_HFHELPER(OBJECT, FEATURE, GETTER) \
case static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE): { \
inputFeatures.emplace_back(hfHelper.GETTER(OBJECT)); \
break; \
#define CHECK_AND_FILL_VEC_OMEGAC0_HFHELPER(OBJECT, FEATURE, GETTER) \
case static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE): { \
inputFeatures.emplace_back(hfHelper.GETTER(OBJECT)); \
break; \
}
namespace o2::analysis
{
enum class InputFeaturesOmegacToOmegaPi : uint8_t {

cosPaOmegacToPv=0,
cosPaOmegacToPv = 0,
kfDcaXYPiFromOmegac,
cosThetaStarPiFromOmegac,
chi2TopoPiFromOmegacToPv,
Expand All @@ -74,7 +74,7 @@ enum class InputFeaturesOmegacToOmegaPi : uint8_t {
nSigmaTPCPiFromV0,
nSigmaTPCPiFromOmegac,
nSigmaTPCKaFromCasc

};

template <typename TypeOutputScore = float>
Expand All @@ -93,27 +93,26 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
/// \param lamProngPi is the candidate's lamProngPi
/// \return inputFeatures vector
template <typename T1, typename T2, typename T3>
std::vector<float> getInputFeatures(T1 const& candidate,T2 const& lamProngPi,T2 const& cascProng, T3 const& charmBaryonProng)
std::vector<float> getInputFeatures(T1 const& candidate, T2 const& lamProngPi, T2 const& cascProng, T3 const& charmBaryonProng)
{
std::vector<float> inputFeatures;

for (const auto& idx : MlResponse<TypeOutputScore>::mCachedIndices) {
switch (idx) {

CHECK_AND_FILL_VEC_OMEGAC0(kfDcaXYPiFromOmegac);
CHECK_AND_FILL_VEC_OMEGAC0(cosThetaStarPiFromOmegac);
CHECK_AND_FILL_VEC_OMEGAC0(chi2TopoPiFromOmegacToPv);
CHECK_AND_FILL_VEC_OMEGAC0(dcaCharmBaryonDau);
CHECK_AND_FILL_VEC_OMEGAC0(invMassCascade);
CHECK_AND_FILL_VEC_OMEGAC0(massCascChi2OverNdf);
CHECK_AND_FILL_VEC_OMEGAC0(kfDcaXYCascToPv);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(candidate,cosPaOmegacToPv,cosPACharmBaryon);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(candidate,cosPaCascToPv,cosPACasc);
// TPC PID variables
CHECK_AND_FILL_VEC_OMEGAC0_FULL(lamProngPi, nSigmaTPCPiFromV0, tpcNSigmaPi);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(cascProng, nSigmaTPCKaFromCasc, tpcNSigmaKa);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(charmBaryonProng,nSigmaTPCPiFromOmegac, tpcNSigmaPi);

CHECK_AND_FILL_VEC_OMEGAC0(kfDcaXYPiFromOmegac);
CHECK_AND_FILL_VEC_OMEGAC0(cosThetaStarPiFromOmegac);
CHECK_AND_FILL_VEC_OMEGAC0(chi2TopoPiFromOmegacToPv);
CHECK_AND_FILL_VEC_OMEGAC0(dcaCharmBaryonDau);
CHECK_AND_FILL_VEC_OMEGAC0(invMassCascade);
CHECK_AND_FILL_VEC_OMEGAC0(massCascChi2OverNdf);
CHECK_AND_FILL_VEC_OMEGAC0(kfDcaXYCascToPv);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(candidate, cosPaOmegacToPv, cosPACharmBaryon);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(candidate, cosPaCascToPv, cosPACasc);
// TPC PID variables
CHECK_AND_FILL_VEC_OMEGAC0_FULL(lamProngPi, nSigmaTPCPiFromV0, tpcNSigmaPi);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(cascProng, nSigmaTPCKaFromCasc, tpcNSigmaKa);
CHECK_AND_FILL_VEC_OMEGAC0_FULL(charmBaryonProng, nSigmaTPCPiFromOmegac, tpcNSigmaPi);
}
}

Expand All @@ -126,21 +125,21 @@ class HfMlResponseOmegacToOmegaPi : public HfMlResponse<TypeOutputScore>
{
MlResponse<TypeOutputScore>::mAvailableInputFeatures = {

FILL_MAP_OMEGAC0(invMassCascade),
FILL_MAP_OMEGAC0(cosPaOmegacToPv),
FILL_MAP_OMEGAC0(dcaCharmBaryonDau),
FILL_MAP_OMEGAC0(kfDcaXYPiFromOmegac),
FILL_MAP_OMEGAC0(cosThetaStarPiFromOmegac),
FILL_MAP_OMEGAC0(chi2TopoPiFromOmegacToPv),
FILL_MAP_OMEGAC0(massCascChi2OverNdf),
FILL_MAP_OMEGAC0(cosPaCascToPv),
FILL_MAP_OMEGAC0(kfDcaXYCascToPv),
FILL_MAP_OMEGAC0(invMassCascade),
FILL_MAP_OMEGAC0(cosPaOmegacToPv),
FILL_MAP_OMEGAC0(dcaCharmBaryonDau),
FILL_MAP_OMEGAC0(kfDcaXYPiFromOmegac),
FILL_MAP_OMEGAC0(cosThetaStarPiFromOmegac),
FILL_MAP_OMEGAC0(chi2TopoPiFromOmegacToPv),
FILL_MAP_OMEGAC0(massCascChi2OverNdf),
FILL_MAP_OMEGAC0(cosPaCascToPv),
FILL_MAP_OMEGAC0(kfDcaXYCascToPv),
// TPC PID variables
FILL_MAP_OMEGAC0(nSigmaTPCPiFromV0),
FILL_MAP_OMEGAC0(nSigmaTPCKaFromCasc),
FILL_MAP_OMEGAC0(nSigmaTPCPiFromOmegac),
FILL_MAP_OMEGAC0(nSigmaTPCKaFromCasc),
FILL_MAP_OMEGAC0(nSigmaTPCPiFromOmegac),

};
};
}
};

Expand Down
8 changes: 3 additions & 5 deletions PWGHF/Core/SelectorCuts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check warning on line 1 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -10,7 +10,7 @@
// or submit itself to any jurisdiction.

/// \file SelectorCuts.h
/// \brief Default pT bins and cut arrays for heavy-flavour selectors and analysis tasks

Check warning on line 13 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \author is missing, incorrect or misplaced.

#ifndef PWGHF_CORE_SELECTORCUTS_H_
#define PWGHF_CORE_SELECTORCUTS_H_
Expand All @@ -25,12 +25,12 @@

namespace hf_cuts_single_track
{
static constexpr int nBinsPtTrack = 6;

Check warning on line 28 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int nCutVarsTrack = 4;

Check warning on line 29 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
// default values for the pT bin edges (can be used to configure histogram axis)
// common for any candidate type (2-prong, 3-prong)
// offset by 1 from the bin numbers in cuts array
constexpr double binsPtTrack[nBinsPtTrack + 1] = {

Check warning on line 33 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
0,
0.5,
1.0,
Expand All @@ -41,7 +41,7 @@
auto vecBinsPtTrack = std::vector<double>{binsPtTrack, binsPtTrack + nBinsPtTrack + 1};

// default values for the dca_xy and dca_z cuts of displaced tracks
constexpr double cutsTrack[nBinsPtTrack][nCutVarsTrack] = {{0.0000, 10., 0.0000, 100.}, /* 0 < pt < 0.5 */

Check warning on line 44 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
{0.0000, 10., 0.0000, 100.}, /* 0.5 < pt < 1 */
{0.0000, 10., 0.0000, 100.}, /* 1 < pt < 1.5 */
{0.0000, 10., 0.0000, 100.}, /* 1.5 < pt < 2 */
Expand All @@ -49,7 +49,7 @@
{0.0000, 10., 0.0000, 100.}}; /* 3 < pt < 1000 */

// default values for the dca_xy and dca_z cuts of primary tracks (e.g. D* soft pions)
constexpr double cutsTrackPrimary[nBinsPtTrack][nCutVarsTrack] = {{0.0000, 2., 0.0000, 100.}, /* 0 < pt < 0.5 */

Check warning on line 52 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
{0.0000, 2., 0.0000, 100.}, /* 0.5 < pt < 1 */
{0.0000, 2., 0.0000, 100.}, /* 1 < pt < 1.5 */
{0.0000, 2., 0.0000, 100.}, /* 1.5 < pt < 2 */
Expand All @@ -66,7 +66,7 @@
namespace hf_presel_pid
{
// default values for the PID cuts for protons in the track-index-skim-creator
constexpr float cutsPid[4][6] = {{0.f, 1000.f, 5.f, 0.f, 1000.f, 5.f},

Check warning on line 69 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
{0.f, 1000.f, 5.f, 0.f, 1000.f, 5.f},
{0.f, 1000.f, 5.f, 0.f, 1000.f, 5.f},
{0.f, 1000.f, 5.f, 0.f, 1000.f, 5.f}};
Expand All @@ -76,8 +76,8 @@

namespace hf_cuts_bdt_multiclass
{
static constexpr int nBinsPt = 1;

Check warning on line 79 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
static constexpr int nCutBdtScores = 3;

Check warning on line 80 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/constexpr-constant] 

Use UpperCamelCase for names of constexpr constants. Names of special constants may be prefixed with "k".
// default values for the pT bin edges (can be used to configure histogram axis)
// common for any charm candidate
// offset by 1 from the bin numbers in cuts array
Expand Down Expand Up @@ -663,13 +663,12 @@
2.0,
4.0,
6.0,
12.0
};
12.0};

auto vecBinsPt = std::vector<double>{binsPt, binsPt + nBinsPt + 1};

// default values for the cuts
// pi_pT
// pi_pT

Check failure on line 671 in PWGHF/Core/SelectorCuts.h

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Tab characters found 

Indent code using spaces instead of tabs.
constexpr double cuts[nBinsPt][nCutVars] = {{0.2}, /* 1 < pt < 2 */
{0.2}, /* 2 < pt < 4 */
{0.6}, /* 4 < pt < 6 */
Expand All @@ -680,8 +679,7 @@
"pT bin 0",
"pT bin 1",
"pT bin 2",
"pT bin 3"
};
"pT bin 3"};

// column labels
static const std::vector<std::string> labelsCutVar = {"pT pi from Omegac"};
Expand Down
54 changes: 27 additions & 27 deletions PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / line endings

DOS line endings 

Files must have UNIX-style (LF only) line endings. Found 245 DOS-style (CR+LF) line endings.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -14,7 +14,6 @@
///
/// \author Yunfan Liu <yunfan.liu@cern.ch>, China University of Geosciences


#include <vector>

#include "CommonConstants/PhysicsConstants.h"
Expand Down Expand Up @@ -56,14 +55,13 @@
ConfigurableAxis thnConfigAxisGenPtB{"thnConfigAxisGenPtB", {1000, 0, 100}, "Gen Pt B"};
ConfigurableAxis thnConfigAxisNumPvContr{"thnConfigAxisNumPvContr", {200, -0.5, 199.5}, "Number of PV contributors"};


HfHelper hfHelper;
using MyTracksWMc = soa::Join<aod::Tracks, aod::TracksIU, aod::McTrackLabels>;

using Omegac0Candidates = soa::Join<aod::HfCandToOmegaPi, aod::HfSelToOmegaPi>;
using Omegac0CandidatesKF = soa::Join<Omegac0Candidates, aod::HfOmegacKf>;
using OmegaC0CandidatesMcKF = soa::Join<Omegac0CandidatesKF, aod::HfToOmegaPiMCRec>;

using Omegac0CandidatesMl = soa::Join<aod::HfCandToOmegaPi, aod::HfMlSelOmegacToOmegaPi>;
using Omegac0CandidatesMlKF = soa::Join<Omegac0CandidatesMl, aod::HfOmegacKf>;
using Omegac0CandidatesMlMcKF = soa::Join<Omegac0CandidatesMlKF, aod::HfToOmegaPiMCRec>;
Expand All @@ -73,14 +71,13 @@
PresliceUnsorted<CollisionsWithMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
SliceCache cache;


HistogramRegistry registry{
"registry",
{}};
{}};

void init(InitContext&)
{
std::array<bool, 12> doprocess{ doprocessDataWithKFParticle, doprocessMcWithKFParticle, doprocessDataWithKFParticleMl, doprocessMcWithKFParticleMl};
std::array<bool, 12> doprocess{doprocessDataWithKFParticle, doprocessMcWithKFParticle, doprocessDataWithKFParticleMl, doprocessMcWithKFParticleMl};
if ((std::accumulate(doprocess.begin(), doprocess.end(), 0)) == 0) {
LOGP(fatal, "At least one process function should be enabled at a time.");
}
Expand All @@ -94,14 +91,18 @@
const AxisSpec thnAxisGenPtB{thnConfigAxisGenPtB, "#it{p}_{T}^{B} (GeV/#it{c})"};
const AxisSpec thnAxisNumPvContr{thnConfigAxisNumPvContr, "Number of PV contributors"};

if ( doprocessMcWithKFParticle || doprocessMcWithKFParticleMl) {
if (doprocessMcWithKFParticle || doprocessMcWithKFParticleMl) {
std::vector<AxisSpec> axesAcc = {thnAxisGenPtD, thnAxisGenPtB, thnAxisY, thnAxisOrigin, thnAxisNumPvContr};
registry.add("hSparseAcc", "Thn for generated Omega0 from charm and beauty", HistType::kTHnSparseD, axesAcc);
registry.get<THnSparse>(HIST("hSparseAcc"))->Sumw2();
}

std::vector<AxisSpec> axes = {thnAxisMass, thnAxisPt, thnAxisY,};
if ( doprocessMcWithKFParticle|| doprocessMcWithKFParticleMl) {
std::vector<AxisSpec> axes = {
thnAxisMass,
thnAxisPt,
thnAxisY,
};
if (doprocessMcWithKFParticle || doprocessMcWithKFParticleMl) {
axes.push_back(thnAxisPtB);
axes.push_back(thnAxisOrigin);
axes.push_back(thnAxisNumPvContr);
Expand Down Expand Up @@ -134,9 +135,9 @@
auto rapidityCandidate = candidate.kfRapOmegac();
auto ptCandidate = candidate.ptCharmBaryon();
if constexpr (applyMl) {
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], massOmegac0, ptCandidate, rapidityCandidate);
} else {
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), massOmegac0, ptCandidate, rapidityCandidate);
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], massOmegac0, ptCandidate, rapidityCandidate);
} else {
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), massOmegac0, ptCandidate, rapidityCandidate);
}
}
}
Expand All @@ -148,9 +149,9 @@
PROCESS_SWITCH(HfTaskOmegac0, processDataWithKFParticle, "process taskOmegac0 with KFParticle", false);
// TODO: add processKFParticleCent

void processDataWithKFParticleMl(Omegac0CandidatesMlKF const&omegac0CandidatesMlKF, Collisions const& collisions)
void processDataWithKFParticleMl(Omegac0CandidatesMlKF const& omegac0CandidatesMlKF, Collisions const& collisions)
{
processData<true>(omegac0CandidatesMlKF, collisions);
processData<true>(omegac0CandidatesMlKF, collisions);
}
PROCESS_SWITCH(HfTaskOmegac0, processDataWithKFParticleMl, "process taskOmegac0 with KFParticle and ML selections", false);
// TODO: add processKFParticleMlCent
Expand All @@ -176,15 +177,15 @@
massOmegac0 = candidate.invMassCharmBaryon();
auto ptCandidate = candidate.ptCharmBaryon();
auto rapidityCandidate = candidate.kfRapOmegac();
if (candidate.flagMcMatchRec() == (1 << aod::hf_cand_xic0_omegac0::DecayType::OmegaczeroToOmegaPi)) {
if constexpr (applyMl) {
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], massOmegac0, ptCandidate, rapidityCandidate, candidate.ptBhadMotherPart(), candidate.originRec(), numPvContributors);

} else {
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), massOmegac0, ptCandidate, rapidityCandidate, candidate.ptBhadMotherPart(), candidate.originRec(), numPvContributors);
}
}

if (candidate.flagMcMatchRec() == (1 << aod::hf_cand_xic0_omegac0::DecayType::OmegaczeroToOmegaPi)) {
if constexpr (applyMl) {
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], massOmegac0, ptCandidate, rapidityCandidate, candidate.ptBhadMotherPart(), candidate.originRec(), numPvContributors);

} else {
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), massOmegac0, ptCandidate, rapidityCandidate, candidate.ptBhadMotherPart(), candidate.originRec(), numPvContributors);
}
}
}
// MC gen.
for (const auto& particle : mcParticles) {
Expand All @@ -198,12 +199,11 @@
registry.fill(HIST("hPtGen"), ptGen);
registry.fill(HIST("hPtVsYGen"), ptGen, yGen);

unsigned maxNumContrib = 0;
unsigned maxNumContrib = 0;
const auto& recoCollsPerMcColl = collisions.sliceBy(colPerMcCollision, particle.mcCollision().globalIndex());
for (const auto& recCol : recoCollsPerMcColl) {
maxNumContrib = recCol.numContrib() > maxNumContrib ? recCol.numContrib() : maxNumContrib;
}


if (particle.originGen() == RecoDecay::OriginType::Prompt) {
registry.fill(HIST("hSparseAcc"), ptGen, ptGenB, yGen, 1, maxNumContrib);
Expand All @@ -216,7 +216,7 @@
}
}

void processMcWithKFParticle(OmegaC0CandidatesMcKF const&omegaC0CandidatesMcKF,
void processMcWithKFParticle(OmegaC0CandidatesMcKF const& omegaC0CandidatesMcKF,
soa::Join<aod::McParticles, aod::HfToOmegaPiMCGen> const& mcParticles,
MyTracksWMc const& tracks,
CollisionsWithMcLabels const& collisions,
Expand Down
4 changes: 2 additions & 2 deletions PWGHF/DataModel/CandidateReconstructionTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ DECLARE_SOA_TABLE(HfCandToOmegaPi, "AOD", "HFCANDTOOMEGAPI",
hf_cand_xic0_omegac0::PtPiFromCharmBaryon<hf_cand_xic0_omegac0::PxBachFromCharmBaryon, hf_cand_xic0_omegac0::PyBachFromCharmBaryon>,
hf_cand_xic0_omegac0::PtLambda<hf_cand_xic0_omegac0::PxLambda, hf_cand_xic0_omegac0::PyLambda>,
hf_cand_xic0_omegac0::PtKaFromCasc<hf_cand_xic0_omegac0::PxBachFromCasc, hf_cand_xic0_omegac0::PyBachFromCasc>,

hf_cand_xic0_omegac0::ImpactParCascXY, hf_cand_xic0_omegac0::ImpactParBachFromCharmBaryonXY, hf_cand_xic0_omegac0::ImpactParCascZ, hf_cand_xic0_omegac0::ImpactParBachFromCharmBaryonZ,
hf_cand_xic0_omegac0::ErrImpactParCascXY, hf_cand_xic0_omegac0::ErrImpactParBachFromCharmBaryonXY,
hf_cand_xic0_omegac0::V0Id, v0data::PosTrackId, v0data::NegTrackId, hf_cand_xic0_omegac0::CascadeId, hf_cand_xic0_omegac0::BachelorFromCharmBaryonId, cascdata::BachelorId,
Expand All @@ -1460,7 +1460,7 @@ DECLARE_SOA_TABLE(HfCandToOmegaPi, "AOD", "HFCANDTOOMEGAPI",
hf_cand_xic0_omegac0::DcaXYToPvV0Dau0, hf_cand_xic0_omegac0::DcaXYToPvV0Dau1, hf_cand_xic0_omegac0::DcaXYToPvCascDau,
hf_cand_xic0_omegac0::DcaZToPvV0Dau0, hf_cand_xic0_omegac0::DcaZToPvV0Dau1, hf_cand_xic0_omegac0::DcaZToPvCascDau,
hf_cand_xic0_omegac0::DcaCascDau, hf_cand_xic0_omegac0::DcaV0Dau, hf_cand_xic0_omegac0::DcaCharmBaryonDau,
hf_cand_xic0_omegac0::DecLenCharmBaryon, hf_cand_xic0_omegac0::DecLenCascade, hf_cand_xic0_omegac0::DecLenV0, hf_cand_xic0_omegac0::ErrorDecayLengthCharmBaryon, hf_cand_xic0_omegac0::ErrorDecayLengthXYCharmBaryon,hf_track_index::HFflag,
hf_cand_xic0_omegac0::DecLenCharmBaryon, hf_cand_xic0_omegac0::DecLenCascade, hf_cand_xic0_omegac0::DecLenV0, hf_cand_xic0_omegac0::ErrorDecayLengthCharmBaryon, hf_cand_xic0_omegac0::ErrorDecayLengthXYCharmBaryon, hf_track_index::HFflag,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(HfCandToOmegaK, "AOD", "HFCANDTOOMEGAK",
Expand Down
4 changes: 2 additions & 2 deletions PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ struct HfCandidateCreatorXic0Omegac0 {
dcaxyV0Dau0, dcaxyV0Dau1, dcaxyCascBachelor,
dcazV0Dau0, dcazV0Dau1, dcazCascBachelor,
dcaCascDau, dcaV0Dau, dcaCharmBaryonDau,
decLenCharmBaryon, decLenCascade, decLenV0, errorDecayLengthCharmBaryon, errorDecayLengthXYCharmBaryon,cand.hfflag());
decLenCharmBaryon, decLenCascade, decLenV0, errorDecayLengthCharmBaryon, errorDecayLengthXYCharmBaryon, cand.hfflag());

} else {
rowCandToOmegaK(
Expand Down Expand Up @@ -1156,7 +1156,7 @@ struct HfCandidateCreatorXic0Omegac0 {
dcaxyV0Dau0, dcaxyV0Dau1, dcaxyCascBachelor,
dcazV0Dau0, dcazV0Dau1, dcazCascBachelor,
kfOmegac0Candidate.kfDcaCascDau, kfOmegac0Candidate.kfDcaV0Dau, kfOmegac0Candidate.kfDcaOmegacDau,
decLenCharmBaryon, decLenCascade, decLenV0, errorDecayLengthCharmBaryon, errorDecayLengthXYCharmBaryon,cand.hfflag());
decLenCharmBaryon, decLenCascade, decLenV0, errorDecayLengthCharmBaryon, errorDecayLengthXYCharmBaryon, cand.hfflag());
// fill kf table
kfCandidateData(kfOmegac0Candidate.kfDcaXYPiFromOmegac, kfOmegac0Candidate.kfDcaXYCascToPv,
kfOmegac0Candidate.chi2GeoV0, kfOmegac0Candidate.chi2GeoCasc, kfOmegac0Candidate.chi2GeoOmegac, kfOmegac0Candidate.chi2MassV0, kfOmegac0Candidate.chi2MassCasc,
Expand Down
Loading
Loading