Skip to content

Please consider the following formatting changes to #11441 #9

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

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #11441 #9

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
4 changes: 1 addition & 3 deletions ALICE3/DataModel/OTFMulticharm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion1, xiCPion1, int, Tracks, "_Pi1XiC");
DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion2, xiCPion2, int, Tracks, "_Pi2XiC");
DECLARE_SOA_INDEX_COLUMN_FULL(XiCCPion, xiCCPion, int, Tracks, "_PiXiCC");


DECLARE_SOA_COLUMN(XicMass, xicMass, float);
DECLARE_SOA_COLUMN(XiccMass, xiccMass, float);

Expand Down Expand Up @@ -100,7 +99,6 @@ DECLARE_SOA_COLUMN(Pi2cEta, pi2cEta, float);
DECLARE_SOA_COLUMN(PiccPt, piccPt, float);
DECLARE_SOA_COLUMN(PiccEta, piccEta, float);


} // namespace otfmulticharm
DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
o2::soa::Index<>,
Expand Down Expand Up @@ -158,7 +156,7 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
otfmulticharm::PiccTofNSigmaInner,
otfmulticharm::PiccTofDeltaOuter,
otfmulticharm::PiccTofNSigmaOuter,

otfmulticharm::BachPt,
otfmulticharm::BachEta,

Expand Down
15 changes: 7 additions & 8 deletions ALICE3/TableProducer/alice3-multicharmTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@

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

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

Check failure on line 148 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 149 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 150 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 +241,14 @@
thisXiCCcandidate.parentTrackCovMatrix[5] = covVtx(2, 2);

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

Check failure on line 244 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 249 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 251 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,13 +311,13 @@
thisXiCcandidate.parentTrackCovMatrix[5] = covVtx(2, 2);

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

Check failure on line 314 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 318 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 320 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 All @@ -332,7 +332,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 335 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 @@ -726,14 +726,14 @@
thisXiCcandidate.dca, thisXiCCcandidate.dca,
thisXiCcandidate.mass, thisXiCCcandidate.mass,
thisXiCCcandidate.pt, thisXiCCcandidate.eta,
xi.dcaXY(), xi.dcaZ(),
xicdcaXY, xicdcaZ,
xi.dcaXY(), xi.dcaZ(),
xicdcaXY, xicdcaZ,
xiccdcaXY, xiccdcaZ,
piFromXi.dcaXY(), piFromXi.dcaZ(),
piFromLa.dcaXY(), piFromLa.dcaZ(),
piFromXi.dcaXY(), piFromXi.dcaZ(),
piFromLa.dcaXY(), piFromLa.dcaZ(),
prFromLa.dcaXY(), prFromLa.dcaZ(),
pi1c.dcaXY(), pi1c.dcaZ(),
pi2c.dcaXY(), pi2c.dcaZ(),
pi1c.dcaXY(), pi1c.dcaZ(),
pi2c.dcaXY(), pi2c.dcaZ(),
picc.dcaXY(), picc.dcaZ(),
xicDecayRadius2D, xiccDecayRadius2D,
xicProperLength, xicDecayDistanceFromPV,
Expand All @@ -749,8 +749,7 @@
piFromLa.pt(), piFromLa.eta(),
pi1c.pt(), pi1c.eta(),
pi2c.pt(), pi2c.eta(),
picc.pt(), picc.eta()
);
picc.pt(), picc.eta());
}
}
histos.fill(HIST("hCombinationsXiCC"), nCombinationsCC);
Expand Down
66 changes: 32 additions & 34 deletions ALICE3/Tasks/alice3-multicharm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,15 @@
#include "DetectorsVertexing/PVertexerHelpers.h"
#include "CommonConstants/PhysicsConstants.h"


using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;

using multicharmtracks = soa::Join<aod::MCharmIndices, aod::MCharmCores>;

struct alice3multicharm
{
struct alice3multicharm {
SliceCache cache;

ConfigurableAxis axisEta{"axisEta", {80, -4.0f, +4.0f}, "#eta"};
ConfigurableAxis axisXiccMass{"axisXiccMass", {200, 3.521f, 3.721f}, "Xicc Inv Mass (GeV/c^{2})"};
ConfigurableAxis axisDCA{"axisDCA", {400, 0, 400}, "DCA (#mum)"};
Expand All @@ -82,7 +80,7 @@ struct alice3multicharm
Configurable<float> picMinDCAz{"picMinDCAz", -1, "[0] in |DCAxy| > [0]+[1]/pT"};
Configurable<float> picMaxTofDiffInner{"picTofDiffInner", 1e+4, "|signal - expected| (ps)"};
Configurable<float> picMinPt{"picMinPt", -1, "Minimum pT for Xic pions"};

Configurable<float> piccMinDCAxy{"piccMinDCAxy", -1, "[0] in |DCAxy| > [0]+[1]/pT"};
Configurable<float> piccMinDCAz{"piccMinDCAz", -1, "[0] in |DCAz| > [0]+[1]/pT"};
Configurable<float> piccMaxTofDiffInner{"piccMaxTofDiffInner", 1e+4, "|signal - expected| (ps)"};
Expand All @@ -97,7 +95,7 @@ struct alice3multicharm
Configurable<float> xicMinDecayDistanceFromPV{"xicMinDecayDistanceFromPV", -1, "Minimum distance for Xic decay from PV (cm)"};
Configurable<float> xicMinProperLength{"xicMinProperLength", -1, "Minimum proper length for Xic decay (cm)"};
Configurable<float> xicMaxProperLength{"xicMaxProperLength", 1e+4, "Minimum proper length for Xic decay (cm)"};

Configurable<float> xiccMaxDauDCA{"xiccMaxDauDCA", 1e+4, "DCA between Xicc daughters (cm)"};
Configurable<float> xiccMinRadius{"xiccMinRadius", -1, "Minimum R2D for Xicc decay (cm)"};
Configurable<float> xiccMinProperLength{"xiccMinProperLength", -1, "Minimum proper length for Xicc decay (cm)"};
Expand Down Expand Up @@ -141,59 +139,59 @@ struct alice3multicharm
for (const auto& xiccCand : multiCharmTracks) {
if (xiccCand.xicDauDCA() > xicMaxDauDCA || xiccCand.xiccDauDCA() > xiccMaxDauDCA)
continue;

if (std::fabs(xiccCand.xiDCAxy()) < xiMinDCAxy || std::fabs(xiccCand.xiDCAz()) < xiMinDCAz)
continue;

if (std::fabs(xiccCand.pi1cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi1cDCAz()) < picMinDCAz)
continue;
continue;

if (std::fabs(xiccCand.pi2cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi2cDCAz()) < picMinDCAz)
continue;
continue;

if (std::fabs(xiccCand.piccDCAxy()) < piccMinDCAxy || std::fabs(xiccCand.piccDCAz()) < piccMinDCAz)
continue;
continue;

if (std::fabs(xiccCand.xicDCAxy()) < xicMinDCAxy || std::fabs(xiccCand.xicDCAz()) < xicMinDCAz)
continue;
continue;

if (std::fabs(xiccCand.pi1cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi1cDCAz()) < picMinDCAz)
continue;
continue;

if (std::fabs(xiccCand.pi2cDCAxy()) < picMinDCAxy || std::fabs(xiccCand.pi2cDCAz()) < picMinDCAz)
continue;

if (std::fabs(xiccCand.xiccDCAxy()) > xiccMaxDCAxy || std::fabs(xiccCand.xiccDCAz()) > xiccMaxDCAz)
continue;

// Cut on time delta as LoI for now
if (xiccCand.pi1cTofDeltaInner() > picMaxTofDiffInner)
continue;
continue;

if (xiccCand.pi2cTofDeltaInner() > picMaxTofDiffInner)
continue;

if (xiccCand.piccTofDeltaInner() > piccMaxTofDiffInner)
continue;
continue;

if (xiccCand.pi1cPt() < picMinPt || xiccCand.pi2cPt() < picMinPt)
continue;

if (xiccCand.piccPt() < piccMinPt)
continue;
continue;

if (xiccCand.xicDecayRadius2D() < xicMinRadius)
continue;
continue;

if (xiccCand.xiccDecayRadius2D() < xiccMinRadius)
continue;

if (xiccCand.xicProperLength() < xicMinProperLength || xiccCand.xicProperLength() > xicMaxProperLength)
continue;

if (xiccCand.xiccProperLength() < xiccMinProperLength || xiccCand.xiccProperLength() > xiccMaxProperLength)
continue;
continue;

if (xiccCand.xicDistanceFromPV() < xicMinDecayDistanceFromPV)
continue;

Expand Down
Loading