Skip to content

[ALICE3] Changes to mcharm datamodel #12192

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
njacazio merged 4 commits into from
Jul 23, 2025
Merged

[ALICE3] Changes to mcharm datamodel #12192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8036ce
Changes to mcharm datamodel
jesgum Jul 22, 2025
0db4d3f
Formatting
jesgum Jul 22, 2025
78a0c16
update
jesgum Jul 22, 2025
8c6ecb0
Formatting
jesgum Jul 22, 2025
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
42 changes: 0 additions & 42 deletions ALICE3/DataModel/OTFMcTrackExtra.h
View file
Open in desktop

This file was deleted.

70 changes: 46 additions & 24 deletions ALICE3/DataModel/OTFMulticharm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#define ALICE3_DATAMODEL_OTFMULTICHARM_H_

// O2 includes
#include "ALICE3/DataModel/OTFStrangeness.h"

#include "Framework/AnalysisDataModel.h"

namespace o2::aod
Expand All @@ -36,8 +38,8 @@ DECLARE_SOA_COLUMN(XicMass, xicMass, float);
DECLARE_SOA_COLUMN(XiccMass, xiccMass, float);

// kine vars
DECLARE_SOA_COLUMN(Pt, pt, float);
DECLARE_SOA_COLUMN(Eta, eta, float);
DECLARE_SOA_COLUMN(XiccPt, xiccPt, float);
DECLARE_SOA_COLUMN(XiccEta, xiccEta, float);

// topo vars
DECLARE_SOA_COLUMN(XiDCAz, xiDCAz, float);
Expand All @@ -49,18 +51,18 @@ DECLARE_SOA_COLUMN(XiccDauDCA, xiccDauDCA, float);
DECLARE_SOA_COLUMN(XiccDCAxy, xiccDCAxy, float);
DECLARE_SOA_COLUMN(XiccDCAz, xiccDCAz, float);

DECLARE_SOA_COLUMN(PiFromXiDCAxy, piFromXiDCAxy, float);
DECLARE_SOA_COLUMN(PiFromLaDCAxy, piFromLaDCAxy, float);
DECLARE_SOA_COLUMN(PrFromLaDCAxy, prFromLaDCAxy, float);
DECLARE_SOA_COLUMN(PiFromXiDCAz, piFromXiDCAz, float);
DECLARE_SOA_COLUMN(PiFromLaDCAz, piFromLaDCAz, float);
DECLARE_SOA_COLUMN(PrFromLaDCAz, prFromLaDCAz, float);
DECLARE_SOA_COLUMN(BachDCAxy, bachDCAxy, float);
DECLARE_SOA_COLUMN(BachDCAz, bachDCAz, float);
DECLARE_SOA_COLUMN(PosDCAxy, posDCAxy, float);
DECLARE_SOA_COLUMN(PosDCAz, posDCAz, float);
DECLARE_SOA_COLUMN(NegDCAxy, negDCAxy, float);
DECLARE_SOA_COLUMN(NegDCAz, negDCAz, float);

DECLARE_SOA_COLUMN(Pi1cDCAxy, pi1cDCAxy, float);
DECLARE_SOA_COLUMN(Pi2cDCAxy, pi2cDCAxy, float);
DECLARE_SOA_COLUMN(PiccDCAxy, piccDCAxy, float);
DECLARE_SOA_COLUMN(Pi1cDCAz, pi1cDCAz, float);
DECLARE_SOA_COLUMN(Pi2cDCAxy, pi2cDCAxy, float);
DECLARE_SOA_COLUMN(Pi2cDCAz, pi2cDCAz, float);
DECLARE_SOA_COLUMN(PiccDCAxy, piccDCAxy, float);
DECLARE_SOA_COLUMN(PiccDCAz, piccDCAz, float);

// Lengths
Expand All @@ -75,14 +77,25 @@ DECLARE_SOA_COLUMN(Pi1cTofDeltaInner, pi1cTofDeltaInner, float);
DECLARE_SOA_COLUMN(Pi1cTofNSigmaInner, pi1cTofNSigmaInner, float);
DECLARE_SOA_COLUMN(Pi1cTofDeltaOuter, pi1cTofDeltaOuter, float);
DECLARE_SOA_COLUMN(Pi1cTofNSigmaOuter, pi1cTofNSigmaOuter, float);
DECLARE_SOA_COLUMN(Pi1cHasRichSignal, pi1cHasRichSignal, bool);
DECLARE_SOA_COLUMN(Pi1cRichNSigma, pi1cRichNSigma, float);
DECLARE_SOA_COLUMN(Pi1cPdgCode, pi1cPdgCode, int);

DECLARE_SOA_COLUMN(Pi2cTofDeltaInner, pi2cTofDeltaInner, float);
DECLARE_SOA_COLUMN(Pi2cTofNSigmaInner, pi2cTofNSigmaInner, float);
DECLARE_SOA_COLUMN(Pi2cTofDeltaOuter, pi2cTofDeltaOuter, float);
DECLARE_SOA_COLUMN(Pi2cTofNSigmaOuter, pi2cTofNSigmaOuter, float);
DECLARE_SOA_COLUMN(Pi2cHasRichSignal, pi2cHasRichSignal, bool);
DECLARE_SOA_COLUMN(Pi2cRichNSigma, pi2cRichNSigma, float);
DECLARE_SOA_COLUMN(Pi2cPdgCode, pi2cPdgCode, int);

DECLARE_SOA_COLUMN(PiccTofDeltaInner, piccTofDeltaInner, float);
DECLARE_SOA_COLUMN(PiccTofNSigmaInner, piccTofNSigmaInner, float);
DECLARE_SOA_COLUMN(PiccTofDeltaOuter, piccTofDeltaOuter, float);
DECLARE_SOA_COLUMN(PiccTofNSigmaOuter, piccTofNSigmaOuter, float);
DECLARE_SOA_COLUMN(PiccHasRichSignal, piccHasRichSignal, bool);
DECLARE_SOA_COLUMN(PiccRichNSigma, piccRichNSigma, float);
DECLARE_SOA_COLUMN(PiccPdgCode, piccPdgCode, int);

// Daughter info
DECLARE_SOA_COLUMN(PosPt, posPt, float);
Expand All @@ -100,6 +113,7 @@ DECLARE_SOA_COLUMN(PiccPt, piccPt, float);
DECLARE_SOA_COLUMN(PiccEta, piccEta, float);

} // namespace otfmulticharm

DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
o2::soa::Index<>,
otfmulticharm::CascadeId,
Expand All @@ -112,8 +126,8 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
otfmulticharm::XiccDauDCA,
otfmulticharm::XicMass,
otfmulticharm::XiccMass,
otfmulticharm::Pt,
otfmulticharm::Eta,
otfmulticharm::XiccPt,
otfmulticharm::XiccEta,

otfmulticharm::XiDCAxy,
otfmulticharm::XiDCAz,
Expand All @@ -122,13 +136,6 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
otfmulticharm::XiccDCAxy,
otfmulticharm::XiccDCAz,

otfmulticharm::PiFromXiDCAxy,
otfmulticharm::PiFromXiDCAz,
otfmulticharm::PiFromLaDCAxy,
otfmulticharm::PiFromLaDCAz,
otfmulticharm::PrFromLaDCAxy,
otfmulticharm::PrFromLaDCAz,

otfmulticharm::Pi1cDCAxy,
otfmulticharm::Pi1cDCAz,
otfmulticharm::Pi2cDCAxy,
Expand All @@ -141,38 +148,53 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
otfmulticharm::XicProperLength,
otfmulticharm::XicDistanceFromPV,
otfmulticharm::XiccProperLength,
otfmulticharm::Pi1cPt,
otfmulticharm::Pi2cPt,
otfmulticharm::PiccPt);

DECLARE_SOA_TABLE(MCharmPID, "AOD", "MCharmPID",
otfmulticharm::Pi1cTofDeltaInner,
otfmulticharm::Pi1cTofNSigmaInner,
otfmulticharm::Pi1cTofDeltaOuter,
otfmulticharm::Pi1cTofNSigmaOuter,
otfmulticharm::Pi1cHasRichSignal,
otfmulticharm::Pi1cRichNSigma,
otfmulticharm::Pi1cPdgCode,

otfmulticharm::Pi2cTofDeltaInner,
otfmulticharm::Pi2cTofNSigmaInner,
otfmulticharm::Pi2cTofDeltaOuter,
otfmulticharm::Pi2cTofNSigmaOuter,
otfmulticharm::Pi2cHasRichSignal,
otfmulticharm::Pi2cRichNSigma,
otfmulticharm::Pi2cPdgCode,

otfmulticharm::PiccTofDeltaInner,
otfmulticharm::PiccTofNSigmaInner,
otfmulticharm::PiccTofDeltaOuter,
otfmulticharm::PiccTofNSigmaOuter,
otfmulticharm::PiccHasRichSignal,
otfmulticharm::PiccRichNSigma,
otfmulticharm::PiccPdgCode);

DECLARE_SOA_TABLE(MCharmExtra, "AOD", "MCharmExtra",
otfmulticharm::BachPt,
otfmulticharm::BachEta,
otfmulticharm::BachDCAxy,
otfmulticharm::BachDCAz,

otfmulticharm::PosPt,
otfmulticharm::PosEta,
otfmulticharm::PosDCAxy,
otfmulticharm::PosDCAz,

otfmulticharm::NegPt,
otfmulticharm::NegEta,
otfmulticharm::NegDCAxy,
otfmulticharm::NegDCAz,

otfmulticharm::Pi1cPt,
otfmulticharm::Pi1cEta,

otfmulticharm::Pi2cPt,
otfmulticharm::Pi2cEta,

otfmulticharm::PiccPt,
otfmulticharm::PiccEta);

} // namespace o2::aod
Expand Down
99 changes: 63 additions & 36 deletions ALICE3/TableProducer/alice3-multicharmTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,43 @@
// HF decays. Work in progress: use at your own risk!
//

#include <cmath>
#include <array>
#include <cstdlib>
#include <map>
#include <iterator>
#include <utility>
#include "PWGLF/DataModel/LFParticleIdentification.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"

#include "Framework/runDataProcessing.h"
#include "Framework/RunningWorkflowInfo.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "DCAFitter/DCAFitterN.h"
#include "ReconstructionDataFormats/Track.h"
#include "ALICE3/DataModel/A3DecayFinderTables.h"
#include "ALICE3/DataModel/OTFMulticharm.h"
#include "ALICE3/DataModel/OTFRICH.h"
#include "ALICE3/DataModel/OTFStrangeness.h"
#include "ALICE3/DataModel/OTFTOF.h"
#include "ALICE3/DataModel/tracksAlice3.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include "PWGLF/DataModel/LFParticleIdentification.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "DetectorsBase/Propagator.h"
#include "DetectorsBase/GeometryManager.h"
#include "DataFormatsParameters/GRPObject.h"
#include "DataFormatsParameters/GRPMagField.h"

#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/PhysicsConstants.h"
#include "DCAFitter/DCAFitterN.h"
#include "DataFormatsCalibration/MeanVertexObject.h"
#include "ALICE3/DataModel/OTFTOF.h"
#include "ALICE3/DataModel/RICH.h"
#include "ALICE3/DataModel/A3DecayFinderTables.h"
#include "ALICE3/DataModel/OTFStrangeness.h"
#include "ALICE3/DataModel/OTFMulticharm.h"
#include "ALICE3/DataModel/tracksAlice3.h"
#include "DataFormatsParameters/GRPMagField.h"
#include "DataFormatsParameters/GRPObject.h"
#include "DetectorsBase/GeometryManager.h"
#include "DetectorsBase/Propagator.h"
#include "DetectorsVertexing/PVertexer.h"
#include "DetectorsVertexing/PVertexerHelpers.h"
#include "CommonConstants/PhysicsConstants.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/RunningWorkflowInfo.h"
#include "Framework/runDataProcessing.h"
#include "ReconstructionDataFormats/Track.h"

#include <array>
#include <cmath>
#include <cstdlib>
#include <iterator>
#include <map>
#include <utility>

using namespace o2;
using namespace o2::framework;
Expand All @@ -68,14 +70,16 @@
// For MC association in pre-selection
using labeledTracks = soa::Join<aod::Tracks, aod::McTrackLabels>;
using tofTracks = soa::Join<aod::Tracks, aod::UpgradeTofs>;
using richTracks = soa::Join<aod::Tracks, aod::RICHs>;
using alice3tracks = soa::Join<aod::Tracks, aod::TracksCov, aod::Alice3DecayMaps, aod::McTrackLabels, aod::TracksDCA, aod::TracksExtraA3, aod::UpgradeTofs, aod::UpgradeTofExpectedTimes>;
using richTracks = soa::Join<aod::Tracks, aod::UpgradeRichs, aod::UpgradeRichSignals>;
using alice3tracks = soa::Join<aod::Tracks, aod::TracksCov, aod::Alice3DecayMaps, aod::McTrackLabels, aod::TracksDCA, aod::TracksExtraA3, aod::UpgradeTofs, aod::UpgradeTofExpectedTimes, aod::UpgradeRichs, aod::UpgradeRichSignals>;

struct alice3multicharmTable {
SliceCache cache;

Produces<aod::MCharmIndices> multiCharmIdx;
Produces<aod::MCharmCores> multiCharmCore;
Produces<aod::MCharmPID> multiCharmPID;
Produces<aod::MCharmExtra> multiCharmExtra;

// Operation and minimisation criteria
Configurable<bool> fillDerivedTable{"fillDerivedTable", false, "fill MCharm[] tables (careful: memory)"};
Expand Down Expand Up @@ -145,9 +149,9 @@

HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};

Partition<aod::McParticles> trueXi = aod::mcparticle::pdgCode == 3312;

Check failure on line 152 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
Partition<aod::McParticles> trueXiC = aod::mcparticle::pdgCode == 4232;

Check failure on line 153 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
Partition<aod::McParticles> trueXiCC = aod::mcparticle::pdgCode == 4422;

Check failure on line 154 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.

// filter expressions for D mesons
static constexpr uint32_t trackSelectionPiFromXiC = 1 << kInnerTOFPion | 1 << kOuterTOFPion | 1 << kRICHPion | 1 << kTruePiFromXiC;
Expand Down Expand Up @@ -241,14 +245,14 @@
thisXiCCcandidate.parentTrackCovMatrix[5] = covVtx(2, 2);

// set relevant values
thisXiCCcandidate.dca = TMath::Sqrt(fitter.getChi2AtPCACandidate());

Check failure on line 248 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
if (thisXiCCcandidate.dca > dcaXiCCDaughtersSelection) {
return false;
}

thisXiCCcandidate.mass = RecoDecay::m(array{array{thisXiCCcandidate.prong0mom[0], thisXiCCcandidate.prong0mom[1], thisXiCCcandidate.prong0mom[2]}, array{thisXiCCcandidate.prong1mom[0], thisXiCCcandidate.prong1mom[1], thisXiCCcandidate.prong1mom[2]}}, array{mass0, mass1});

Check failure on line 253 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
thisXiCCcandidate.pt = std::hypot(thisXiCCcandidate.prong0mom[0] + thisXiCCcandidate.prong1mom[0], thisXiCCcandidate.prong0mom[1] + thisXiCCcandidate.prong1mom[1]);
thisXiCCcandidate.eta = RecoDecay::eta(array{thisXiCCcandidate.prong0mom[0] + thisXiCCcandidate.prong1mom[0], thisXiCCcandidate.prong0mom[1] + thisXiCCcandidate.prong1mom[1], thisXiCCcandidate.prong0mom[2] + thisXiCCcandidate.prong1mom[2]});

Check failure on line 255 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
return true;
}

Expand Down Expand Up @@ -311,16 +315,23 @@
thisXiCcandidate.parentTrackCovMatrix[5] = covVtx(2, 2);

// set relevant values
thisXiCcandidate.dca = TMath::Sqrt(fitter3.getChi2AtPCACandidate());

Check failure on line 318 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
if (thisXiCcandidate.dca > dcaXiCDaughtersSelection) {
return false;
}
thisXiCcandidate.mass = RecoDecay::m(array{array{thisXiCcandidate.prong0mom[0], thisXiCcandidate.prong0mom[1], thisXiCcandidate.prong0mom[2]}, array{thisXiCcandidate.prong1mom[0], thisXiCcandidate.prong1mom[1], thisXiCcandidate.prong1mom[2]}, array{thisXiCcandidate.prong2mom[0], thisXiCcandidate.prong2mom[1], thisXiCcandidate.prong2mom[2]}}, array{p0mass, p1mass, p2mass});

Check failure on line 322 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
thisXiCcandidate.pt = std::hypot(thisXiCcandidate.prong0mom[0] + thisXiCcandidate.prong1mom[0] + thisXiCcandidate.prong2mom[0], thisXiCcandidate.prong0mom[1] + thisXiCcandidate.prong1mom[1] + thisXiCcandidate.prong2mom[1]);
thisXiCcandidate.eta = RecoDecay::eta(array{thisXiCcandidate.prong0mom[0] + thisXiCcandidate.prong1mom[0] + thisXiCcandidate.prong2mom[0], thisXiCcandidate.prong0mom[1] + thisXiCcandidate.prong1mom[1] + thisXiCcandidate.prong2mom[1], thisXiCcandidate.prong0mom[2] + thisXiCcandidate.prong1mom[2] + thisXiCcandidate.prong2mom[2]});

Check failure on line 324 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
return true;
}

template <typename TTrackType>
int getPdgCodeForTrack(TTrackType track)
{
auto mcParticle = track.template mcParticle_as<aod::McParticles>();
return mcParticle.pdgCode();
}

/// function to check if tracks have the same mother in MC
template <typename TTrackType1, typename TTrackType2>
bool checkSameMother(TTrackType1 const& track1, TTrackType2 const& track2)
Expand All @@ -332,7 +343,7 @@
auto mcParticle1 = track1.template mcParticle_as<aod::McParticles>();
auto mcParticle2 = track2.template mcParticle_as<aod::McParticles>();
if (mcParticle1.has_mothers() && mcParticle2.has_mothers()) {
for (auto& mcParticleMother1 : mcParticle1.template mothers_as<aod::McParticles>()) {

Check failure on line 346 in ALICE3/TableProducer/alice3-multicharmTable.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
for (auto& mcParticleMother2 : mcParticle2.template mothers_as<aod::McParticles>()) {
if (mcParticleMother1.globalIndex() == mcParticleMother2.globalIndex()) {
returnValue = true;
Expand Down Expand Up @@ -729,27 +740,43 @@
xi.dcaXY(), xi.dcaZ(),
xicdcaXY, xicdcaZ,
xiccdcaXY, xiccdcaZ,
piFromXi.dcaXY(), piFromXi.dcaZ(),
piFromLa.dcaXY(), piFromLa.dcaZ(),
prFromLa.dcaXY(), prFromLa.dcaZ(),
pi1c.dcaXY(), pi1c.dcaZ(),
pi2c.dcaXY(), pi2c.dcaZ(),
picc.dcaXY(), picc.dcaZ(),
xicDecayRadius2D, xiccDecayRadius2D,
xicProperLength, xicDecayDistanceFromPV,
xicProperLength,
xicDecayDistanceFromPV,
xiccProperLength,
pi1c.pt(),
pi2c.pt(),
picc.pt());

multiCharmPID(
pi1cTOFDiffInner, pi1c.nSigmaPionInnerTOF(),
pi1cTOFDiffOuter, pi1c.nSigmaPionOuterTOF(),
pi1c.hasSigPi(), pi1c.nSigmaPionRich(),
getPdgCodeForTrack(pi1c),

pi2cTOFDiffInner, pi2c.nSigmaPionInnerTOF(),
pi2cTOFDiffOuter, pi2c.nSigmaPionOuterTOF(),
pi2c.hasSigPi(), pi2c.nSigmaPionRich(),
getPdgCodeForTrack(pi2c),

piccTOFDiffInner, picc.nSigmaPionInnerTOF(),
piccTOFDiffOuter, picc.nSigmaPionOuterTOF(),
picc.hasSigPi(), picc.nSigmaPionRich(),
getPdgCodeForTrack(picc));

multiCharmExtra(
piFromXi.pt(), piFromXi.eta(),
piFromXi.dcaXY(), piFromXi.dcaZ(),
prFromLa.pt(), prFromLa.eta(),
prFromLa.dcaXY(), prFromLa.dcaZ(),
piFromLa.pt(), piFromLa.eta(),
pi1c.pt(), pi1c.eta(),
pi2c.pt(), pi2c.eta(),
picc.pt(), picc.eta());
piFromLa.dcaXY(), piFromLa.dcaZ(),
pi1c.eta(),
pi2c.eta(),
picc.eta());
}
}
histos.fill(HIST("hCombinationsXiCC"), nCombinationsCC);
Expand Down
Loading
Loading