Skip to content

Commit add5c6a

Browse files
jtanwar2212jtanwar2212
authored
Merge branch 'AliceO2Group:master' into master
2 parents 9923be5 + 96e3c6e commit add5c6a

78 files changed

Lines changed: 11593 additions & 7779 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ALICE3/Core/OTFParticle.h‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class OTFParticle
5555
mVt = particle.vt();
5656
mFlag = particle.flags();
5757
mStatusCode = particle.statusCode();
58-
mIsFromMcParticles = true;
58+
setBitOff(DecayerBits::ProducedByDecayer);
5959
if (particle.has_mothers()) {
6060
mIndicesMother = {particle.mothersIds().front(), particle.mothersIds().back()};
6161
}
@@ -72,7 +72,6 @@ class OTFParticle
7272
}
7373

7474
// Setters
75-
void setIsPrimary(const bool isPrimary) { mIsPrimary = isPrimary; }
7675
void setCollisionId(const int collisionId) { mCollisionId = collisionId; }
7776
void setPDG(const int pdg) { mPdgCode = pdg; }
7877
void setIndicesMother(const int start, const int stop) { mIndicesMother = {start, stop}; }
@@ -105,9 +104,9 @@ class OTFParticle
105104
int pdgCode() const { return mPdgCode; }
106105
int globalIndex() const { return mGlobalIndex; }
107106
int collisionId() const { return mCollisionId; }
108-
bool isAlive() const { return mIsAlive; }
109-
bool isPrimary() const { return mIsPrimary; }
110-
bool isFromMcParticles() const { return mIsFromMcParticles; }
107+
bool isAlive() const { return checkBit(DecayerBits::IsAlive); }
108+
bool isPrimary() const { return checkBit(DecayerBits::IsPrimary); }
109+
bool isFromMcParticles() const { return !checkBit(DecayerBits::ProducedByDecayer); }
111110
float weight() const
112111
{
113112
static constexpr float Weight = 1.f;
@@ -154,8 +153,8 @@ class OTFParticle
154153
int getMotherIndexStop() const { return mIndicesMother[1]; }
155154
int getDaughterIndexStart() const { return mIndicesDaughter[0]; }
156155
int getDaughterIndexStop() const { return mIndicesDaughter[1]; }
157-
std::array<int, 2> getMothers() const { return mIndicesMother; }
158-
std::array<int, 2> getDaughters() const { return mIndicesDaughter; }
156+
const std::array<int, 2>& getMothers() const { return mIndicesMother; }
157+
const std::array<int, 2>& getDaughters() const { return mIndicesDaughter; }
159158
std::span<const int> getMotherSpan() const { return hasMothers() ? std::span<const int>(mIndicesMother.data(), 2) : std::span<const int>(); }
160159

161160
// Checks
@@ -177,7 +176,7 @@ class OTFParticle
177176
void setBitOn(DecayerBits bit) { mBits.set(static_cast<size_t>(bit), true); }
178177
void setBitOff(DecayerBits bit) { mBits.set(static_cast<size_t>(bit), false); }
179178

180-
std::bitset<8> getBits() const { return mBits; }
179+
const std::bitset<8>& getBits() const { return mBits; }
181180
uint8_t getBitsValue() const { return static_cast<uint8_t>(mBits.to_ulong()); }
182181
void setBits(std::bitset<8> bits) { mBits = bits; }
183182

@@ -186,8 +185,6 @@ class OTFParticle
186185
int mCollisionId{-1};
187186
float mVx{}, mVy{}, mVz{}, mVt{};
188187
float mPx{}, mPy{}, mPz{}, mE{};
189-
bool mIsAlive{}, mIsFromMcParticles{false};
190-
bool mIsPrimary{};
191188

192189
int mStatusCode{};
193190
uint8_t mFlag{};

‎ALICE3/DataModel/OTFMulticharm.h‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ DECLARE_SOA_COLUMN(XiccDauDCA, xiccDauDCA, float);
5353
DECLARE_SOA_COLUMN(XiccDCAxy, xiccDCAxy, float);
5454
DECLARE_SOA_COLUMN(XiccDCAz, xiccDCAz, float);
5555

56-
DECLARE_SOA_COLUMN(BachDCAxy, bachDCAxy, float);
57-
DECLARE_SOA_COLUMN(BachDCAz, bachDCAz, float);
58-
DECLARE_SOA_COLUMN(PosDCAxy, posDCAxy, float);
59-
DECLARE_SOA_COLUMN(PosDCAz, posDCAz, float);
60-
DECLARE_SOA_COLUMN(NegDCAxy, negDCAxy, float);
61-
DECLARE_SOA_COLUMN(NegDCAz, negDCAz, float);
62-
6356
DECLARE_SOA_COLUMN(Pi1cDCAxy, pi1cDCAxy, float);
6457
DECLARE_SOA_COLUMN(Pi1cDCAz, pi1cDCAz, float);
6558
DECLARE_SOA_COLUMN(Pi2cDCAxy, pi2cDCAxy, float);
@@ -75,19 +68,9 @@ DECLARE_SOA_COLUMN(XicDistanceFromPV, xicDistanceFromPV, float);
7568
DECLARE_SOA_COLUMN(XiccProperLength, xiccProperLength, float);
7669

7770
// Daughter info
78-
DECLARE_SOA_COLUMN(PosPt, posPt, float);
79-
DECLARE_SOA_COLUMN(PosEta, posEta, float);
80-
DECLARE_SOA_COLUMN(NegPt, negPt, float);
81-
DECLARE_SOA_COLUMN(NegEta, negEta, float);
82-
DECLARE_SOA_COLUMN(BachPt, bachPt, float);
83-
DECLARE_SOA_COLUMN(BachEta, bachEta, float);
84-
DECLARE_SOA_COLUMN(BachPhi, bachPhi, float);
8571
DECLARE_SOA_COLUMN(Pi1cPt, pi1cPt, float);
86-
DECLARE_SOA_COLUMN(Pi1cEta, pi1cEta, float);
8772
DECLARE_SOA_COLUMN(Pi2cPt, pi2cPt, float);
88-
DECLARE_SOA_COLUMN(Pi2cEta, pi2cEta, float);
8973
DECLARE_SOA_COLUMN(PiccPt, piccPt, float);
90-
DECLARE_SOA_COLUMN(PiccEta, piccEta, float);
9174

9275
} // namespace otfmulticharm
9376

@@ -133,26 +116,6 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
133116
otfmulticharm::PiccPt,
134117
otfmulticharm::LUTConfigId);
135118

136-
DECLARE_SOA_TABLE(MCharmExtra, "AOD", "MCharmExtra",
137-
otfmulticharm::BachPt,
138-
otfmulticharm::BachEta,
139-
otfmulticharm::BachDCAxy,
140-
otfmulticharm::BachDCAz,
141-
142-
otfmulticharm::PosPt,
143-
otfmulticharm::PosEta,
144-
otfmulticharm::PosDCAxy,
145-
otfmulticharm::PosDCAz,
146-
147-
otfmulticharm::NegPt,
148-
otfmulticharm::NegEta,
149-
otfmulticharm::NegDCAxy,
150-
otfmulticharm::NegDCAz,
151-
152-
otfmulticharm::Pi1cEta,
153-
otfmulticharm::Pi2cEta,
154-
otfmulticharm::PiccEta);
155-
156119
} // namespace o2::aod
157120

158121
#endif // ALICE3_DATAMODEL_OTFMULTICHARM_H_

‎ALICE3/DataModel/OTFStrangeness.h‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ DECLARE_SOA_INDEX_COLUMN(Collision, collision);
4141
DECLARE_SOA_INDEX_COLUMN_FULL(CascadeTrack, cascadeTrack, int, Tracks, "_Cascade"); //!
4242
DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "_Pos"); //!
4343
DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg"); //!
44-
DECLARE_SOA_INDEX_COLUMN_FULL(BachTrack, bachTrack, int, Tracks, "_Bach"); //!
44+
DECLARE_SOA_INDEX_COLUMN_FULL(Bachelor, bachelor, int, Tracks, "_Bach"); //!
4545

4646
DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle);
4747

@@ -53,6 +53,8 @@ DECLARE_SOA_COLUMN(CascRadius, cascRadius, float);
5353
DECLARE_SOA_COLUMN(CascRadiusMC, cascRadiusMC, float);
5454
DECLARE_SOA_COLUMN(MLambda, mLambda, float);
5555
DECLARE_SOA_COLUMN(MXi, mXi, float);
56+
DECLARE_SOA_COLUMN(DCAXYCascToPV, dcaXYCascToPV, float);
57+
DECLARE_SOA_COLUMN(DCAZCascToPV, dcaZCascToPV, float);
5658

5759
// strangeness tracking
5860
DECLARE_SOA_COLUMN(FindableClusters, findableClusters, int);
@@ -65,7 +67,7 @@ DECLARE_SOA_TABLE(UpgradeCascades, "AOD", "UPGRADECASCADES",
6567
otfcascade::CascadeTrackId,
6668
otfcascade::PosTrackId,
6769
otfcascade::NegTrackId,
68-
otfcascade::BachTrackId,
70+
otfcascade::BachelorId,
6971
otfcascade::DcaV0Daughters,
7072
otfcascade::DcaCascadeDaughters,
7173
otfcascade::V0Radius,
@@ -74,12 +76,16 @@ DECLARE_SOA_TABLE(UpgradeCascades, "AOD", "UPGRADECASCADES",
7476
otfcascade::MLambda,
7577
otfcascade::MXi,
7678
otfcascade::FindableClusters,
77-
otfcascade::FoundClusters);
79+
otfcascade::FoundClusters,
80+
otfcascade::DCAXYCascToPV,
81+
otfcascade::DCAZCascToPV);
7882

7983
using UpgradeCascade = UpgradeCascades::iterator;
8084

8185
DECLARE_SOA_TABLE(A3CascadeMcLabels, "AOD", "A3CASCADEMCLABELS",
8286
o2::soa::Index<>, otfcascade::McParticleId);
87+
DECLARE_SOA_TABLE(UpgradeCascadeMcLabels, "AOD", "UPGRADECASCMCLAB",
88+
o2::soa::Index<>, otfcascade::McParticleId);
8389

8490
namespace casc_pid
8591
{

‎ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ struct OnTheFlyDecayer {
164164
for (auto& daughter : decayStack) {
165165
daughter.setIndicesMother(particlesInDataframe - indexOffset + i, particlesInDataframe - indexOffset + i);
166166
daughter.setCollisionId(particle.collisionId());
167+
daughter.setBitOn(o2::upgrade::DecayerBits::ProducedByDecayer);
167168
daughter.setBitOn(o2::upgrade::DecayerBits::IsAlive);
168169
daughter.setBitOff(o2::upgrade::DecayerBits::IsPrimary);
169170
daughter.setProductionTime(particle.vt() + trackTimeNS);

0 commit comments

Comments
 (0)