anton's fixes

Author: jesgum

ALICE3/Core/OTFParticle.h

@@ -155,8 +155,8 @@ class OTFParticle
   std::span<const int> getMotherSpan() const { return hasMothers() ? std::span<const int>(mIndicesMother.data(), 2) : std::span<const int>(); }
 
   // Checks
-  bool hasDaughters() const { return (mIndicesDaughter[0] > 0); }
-  bool hasMothers() const { return (mIndicesMother[0] > 0); }
+  bool hasDaughters() const { return (mIndicesDaughter[0] >= 0); }
+  bool hasMothers() const { return (mIndicesMother[0] >= 0); }
   bool hasNaN() const
   {
     return std::isnan(mPx) || std::isnan(mPy) || std::isnan(mPz) || std::isnan(mE) ||

ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx

@@ -120,6 +120,10 @@ struct OnTheFlyDecayer {
   std::vector<o2::upgrade::OTFParticle> allParticles;
   void decayParticles(const int start, const int stop)
   {
+    if (start >= stop) {
+      return;
+    }
+
     int ndau = 0;
     for (int i = start; i < stop; ++i) {
       o2::upgrade::OTFParticle& particle = allParticles[i];
@@ -134,6 +138,10 @@ struct OnTheFlyDecayer {
 
       particle.setBitOff(o2::upgrade::DecayerBits::IsAlive);
       std::vector<o2::upgrade::OTFParticle> decayStack = decayer.decayParticle(pdgDB, particle);
+      if (decayStack.empty()) {
+        continue;
+      }
+
       const float decayRadius = decayer.getDecayRadius();
       const float trackVelocity = o2::upgrade::computeParticleVelocity(particle.p(), pdgDB->GetParticle(particle.pdgCode())->Mass());
       const int charge = pdgDB->GetParticle(particle.pdgCode())->Charge() / 3;
@@ -151,19 +159,15 @@ struct OnTheFlyDecayer {
 
       const float trackTimeNS = trackLength / trackVelocity * PicoToNano;
       particle.setIndicesDaughter(allParticles.size(), allParticles.size() + (decayStack.size() - 1));
-      for (const o2::upgrade::OTFParticle& daughter : decayStack) {
+      for (auto& daughter : decayStack) {
         daughter.setIndicesMother(i, i);
         daughter.setCollisionId(particle.collisionId());
         daughter.setBitOn(o2::upgrade::DecayerBits::IsAlive);
         daughter.setBitOff(o2::upgrade::DecayerBits::IsPrimary);
         daughter.setProductionTime(trackTimeNS);
         allParticles.push_back(daughter);
-        ndau++;
       }
-    }
-
-    if (start >= stop) {
-      return;
+      ndau += decayStack.size();
     }
 
     decayParticles(stop, stop + ndau);
@@ -172,6 +176,7 @@ struct OnTheFlyDecayer {
   void process(aod::McCollisions_001From<aod::Hash<"TMP"_h>>::iterator const& collision, aod::McParticles_001From<aod::Hash<"TMP"_h>> const& mcParticles)
   {
     allParticles.clear();
+    allParticles.reserve(mcParticles.size() * 2);
     if (collision.globalIndex() == 0) {
       indexOffset = 0;
     }
@@ -190,7 +195,8 @@ struct OnTheFlyDecayer {
     decayParticles(0, allParticles.size());
 
     // Fill output table
-    for (const o2::upgrade::OTFParticle& otfParticle : allParticles) {
+    int id = indexOffset;
+    for (auto& otfParticle : allParticles) {
       otfParticle.setIndexOffset(indexOffset);
       if (otfParticle.hasNaN()) {
         histos.fill(HIST("hNaNBookkeeping"), 1);
@@ -199,7 +205,7 @@ struct OnTheFlyDecayer {
       }
 
       tableOTFDecayerBits(otfParticle.getBitsValue());
-      tableMcParticles(otfParticle.collisionId(), otfParticle.pdgCode(), otfParticle.statusCode(), otfParticle.flags(),
+      tableMcParticles(tableMcCollisions.lastIndex(), otfParticle.pdgCode(), otfParticle.statusCode(), otfParticle.flags(),
                        otfParticle.getMotherSpan(), otfParticle.getDaughters().data(), otfParticle.weight(),
                        otfParticle.px(), otfParticle.py(), otfParticle.pz(), otfParticle.e(),
                        otfParticle.vx(), otfParticle.vy(), otfParticle.vz(), otfParticle.vt());
@@ -208,7 +214,7 @@ struct OnTheFlyDecayer {
     // Particles for later collisions in df's needs to have thier mother
     // and daughter indices adjusted since their global index will be
     // shifted due to the appending of decay products
-    indexOffset += (allParticles.size() - mcParticles.size());
+    indexOffset += allParticles.size();
   }
 };
 

ALICE3/Tasks/alice3DecayerQa.cxx

@@ -132,7 +132,6 @@ struct Alice3DecayerQa {
 
   void process(const aod::McCollision& collision, const aod::McParticles& particles)
   {
-    LOG(info) << particles.size();
     // Group with collision
     auto trueElectronsGrouped = trueElectrons->sliceByCached(aod::mcparticle::mcCollisionId, collision.globalIndex(), cache);
     auto trueMuonsGrouped = trueMuons->sliceByCached(aod::mcparticle::mcCollisionId, collision.globalIndex(), cache);
@@ -164,8 +163,8 @@ struct Alice3DecayerQa {
         histos.fill(HIST("K0S/hHasDecayed"), 1);
         auto daughters = particle.daughtersIds();
         if (daughters.size() == NV0Daughters) {
-          auto dau0 = particles.rawIteratorAt(daughters.front());
-          auto dau1 = particles.rawIteratorAt(daughters.back());
+          auto dau0 = particles.rawIteratorAt(daughters.front() - particles.offset());
+          auto dau1 = particles.rawIteratorAt(daughters.back() - particles.offset());
 
           // K0S -> pi+ pi-
           const bool k0sDecay = (dau0.pdgCode() == PDG_t::kPiPlus && dau1.pdgCode() == PDG_t::kPiMinus) ||
@@ -188,8 +187,8 @@ struct Alice3DecayerQa {
         histos.fill(HIST("Lambda/hHasDecayed"), 1);
         auto daughters = particle.daughtersIds();
         if (daughters.size() == NV0Daughters) {
-          auto dau0 = particles.rawIteratorAt(daughters[0]);
-          auto dau1 = particles.rawIteratorAt(daughters[1]);
+          auto dau0 = particles.rawIteratorAt(daughters[0] - particles.offset());
+          auto dau1 = particles.rawIteratorAt(daughters[1] - particles.offset());
 
           // Lambda -> p pi-
           const bool lambdaDecay = (dau0.pdgCode() == PDG_t::kProton && dau1.pdgCode() == PDG_t::kPiMinus) ||
@@ -212,8 +211,8 @@ struct Alice3DecayerQa {
         histos.fill(HIST("XiMinus/hHasDecayed"), 1);
         auto daughters = particle.daughtersIds();
         if (daughters.size() == NCascadeDaughters) {
-          auto dau0 = particles.rawIteratorAt(daughters.front());
-          auto dau1 = particles.rawIteratorAt(daughters.back());
+          auto dau0 = particles.rawIteratorAt(daughters.front() - particles.offset());
+          auto dau1 = particles.rawIteratorAt(daughters.back() - particles.offset());
 
           // Xi- -> Lambda pi-
           const bool xiDecay = (dau0.pdgCode() == PDG_t::kLambda0 && dau1.pdgCode() == PDG_t::kPiMinus) ||
@@ -229,8 +228,8 @@ struct Alice3DecayerQa {
             if (v0.has_daughters()) {
               auto v0daughters = v0.daughtersIds();
               if (v0daughters.size() == NV0Daughters) {
-                auto v0dau0 = particles.rawIteratorAt(v0daughters.front());
-                auto v0dau1 = particles.rawIteratorAt(v0daughters.back());
+                auto v0dau0 = particles.rawIteratorAt(v0daughters.front() - particles.offset());
+                auto v0dau1 = particles.rawIteratorAt(v0daughters.back() - particles.offset());
                 const bool lambdaDecay = (v0dau0.pdgCode() == PDG_t::kProton && v0dau1.pdgCode() == PDG_t::kPiMinus) ||
                                          (v0dau0.pdgCode() == PDG_t::kPiMinus && v0dau1.pdgCode() == PDG_t::kProton);
                 if (lambdaDecay) {