Merge branch 'master' into njacazio-patch-clean-pidresponse

Author: njacazio

.github/workflows/mega-linter.yml

@@ -38,7 +38,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v9.2.0
+        uses: oxsecurity/megalinter@v9.3.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

ALICE3/DataModel/A3DecayFinderTables.h

@@ -389,14 +389,16 @@ namespace a3_mc_truth
 DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int);           //!
 DECLARE_SOA_COLUMN(BHadMotherPtRec, bHadMotherPtRec, float); //!
 DECLARE_SOA_COLUMN(FlagMcRec, flagMcRec, int);               //!
+DECLARE_SOA_COLUMN(ParticleMcRec, particleMcRec, int);       //!
 DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int);           //!
 DECLARE_SOA_COLUMN(BHadMotherPtGen, bHadMotherPtGen, float); //!
 DECLARE_SOA_COLUMN(FlagMcGen, flagMcGen, int);               //!
 } // namespace a3_mc_truth
 DECLARE_SOA_TABLE(Alice3McRecFlags, "AOD", "ALICE3MCRECFLAG", //!
                   a3_mc_truth::OriginMcRec,
                   a3_mc_truth::BHadMotherPtRec,
-                  a3_mc_truth::FlagMcRec);
+                  a3_mc_truth::FlagMcRec,
+                  a3_mc_truth::ParticleMcRec);
 
 DECLARE_SOA_TABLE(Alice3McGenFlags, "AOD", "ALICE3MCGENFLAG", //!
                   a3_mc_truth::OriginMcGen,

ALICE3/DataModel/OTFStrangeness.h

@@ -20,6 +20,8 @@
 #define ALICE3_DATAMODEL_OTFSTRANGENESS_H_
 
 // O2 includes
+#include "Common/Core/RecoDecay.h"
+
 #include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
@@ -33,8 +35,8 @@ DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg");
 DECLARE_SOA_INDEX_COLUMN_FULL(BachTrack, bachTrack, int, Tracks, "_Bach");          //!
 
 // topo vars
-DECLARE_SOA_COLUMN(DCAV0Daughters, dcaV0Daughters, float);
-DECLARE_SOA_COLUMN(DCACascadeDaughters, dcaCascadeDaughters, float);
+DECLARE_SOA_COLUMN(DcaV0Daughters, dcaV0Daughters, float);
+DECLARE_SOA_COLUMN(DcaCascadeDaughters, dcaCascadeDaughters, float);
 DECLARE_SOA_COLUMN(V0Radius, v0Radius, float);
 DECLARE_SOA_COLUMN(CascRadius, cascRadius, float);
 DECLARE_SOA_COLUMN(CascRadiusMC, cascRadiusMC, float);
@@ -53,8 +55,8 @@ DECLARE_SOA_TABLE(UpgradeCascades, "AOD", "UPGRADECASCADES",
                   otfcascade::PosTrackId,
                   otfcascade::NegTrackId,
                   otfcascade::BachTrackId,
-                  otfcascade::DCAV0Daughters,
-                  otfcascade::DCACascadeDaughters,
+                  otfcascade::DcaV0Daughters,
+                  otfcascade::DcaCascadeDaughters,
                   otfcascade::V0Radius,
                   otfcascade::CascRadius,
                   otfcascade::CascRadiusMC,
@@ -70,10 +72,10 @@ namespace otfv0
 DECLARE_SOA_INDEX_COLUMN(Collision, collision);                         //!
 DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "_Pos"); //!
 DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg"); //!
-DECLARE_SOA_INDEX_COLUMN(V0, v0);                                       //!
+DECLARE_SOA_INDEX_COLUMN(V0, v0);                                       //! index of the mc particle corresponding to the V0
 
 // topo vars
-DECLARE_SOA_COLUMN(DCAV0Daughters, dcaV0Daughters, float);
+DECLARE_SOA_COLUMN(DcaV0Daughters, dcaV0Daughters, float);
 DECLARE_SOA_COLUMN(V0Radius, v0Radius, float);
 DECLARE_SOA_COLUMN(MLambda, mLambda, float);
 DECLARE_SOA_COLUMN(MAntiLambda, mAntiLambda, float);
@@ -86,16 +88,166 @@ DECLARE_SOA_COLUMN(Pt, pt, float);
 DECLARE_SOA_TABLE(UpgradeV0s, "AOD", "UPGRADEV0S",
                   o2::soa::Index<>,
                   otfv0::CollisionId,
+                  otfv0::V0Id,
                   otfv0::PosTrackId,
                   otfv0::NegTrackId,
-                  otfv0::DCAV0Daughters,
+                  otfv0::DcaV0Daughters,
                   otfv0::V0Radius,
                   otfv0::MLambda,
                   otfv0::MAntiLambda,
                   otfv0::MK0,
                   otfv0::Pt);
 
 using UpgradeV0 = UpgradeV0s::iterator;
-} // namespace o2::aod
 
+namespace candidatev0
+{
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);                         //!
+DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "_Pos"); //!
+DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg"); //!
+DECLARE_SOA_INDEX_COLUMN(V0, v0);                                       //!
+
+// Label to MC particle
+DECLARE_SOA_INDEX_COLUMN_FULL(McParticle, mcParticle, int, McParticles, ""); //! label to the MC particle corresponding to the V0
+
+// General V0 properties: position, momentum
+DECLARE_SOA_COLUMN(PosX, posX, float);   //! positive track X at min
+DECLARE_SOA_COLUMN(NegX, negX, float);   //! negative track X at min
+DECLARE_SOA_COLUMN(PxPos, pxPos, float); //! positive track px at min
+DECLARE_SOA_COLUMN(PyPos, pyPos, float); //! positive track py at min
+DECLARE_SOA_COLUMN(PzPos, pzPos, float); //! positive track pz at min
+DECLARE_SOA_COLUMN(PxNeg, pxNeg, float); //! negative track px at min
+DECLARE_SOA_COLUMN(PyNeg, pyNeg, float); //! negative track py at min
+DECLARE_SOA_COLUMN(PzNeg, pzNeg, float); //! negative track pz at min
+DECLARE_SOA_COLUMN(X, x, float);         //! decay position X
+DECLARE_SOA_COLUMN(Y, y, float);         //! decay position Y
+DECLARE_SOA_COLUMN(Z, z, float);         //! decay position Z
+
+// topo vars
+DECLARE_SOA_COLUMN(DcaV0Daughters, dcaV0Daughters, float);
+DECLARE_SOA_COLUMN(CosPA, cosPA, float);
+DECLARE_SOA_COLUMN(DcaPosToPV, dcaPosToPV, float);
+DECLARE_SOA_COLUMN(DcaNegToPV, dcaNegToPV, float);
+DECLARE_SOA_COLUMN(DcaV0ToPV, dcaV0ToPV, float);
+
+//______________________________________________________
+// DYNAMIC COLUMNS
+
+DECLARE_SOA_DYNAMIC_COLUMN(Px, px, //! V0 px
+                           [](float pxPos, float pxNeg) -> float { return pxPos + pxNeg; });
+DECLARE_SOA_DYNAMIC_COLUMN(Py, py, //! V0 py
+                           [](float pyPos, float pyNeg) -> float { return pyPos + pyNeg; });
+DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, //! V0 pz
+                           [](float pzPos, float pzNeg) -> float { return pzPos + pzNeg; });
+DECLARE_SOA_DYNAMIC_COLUMN(Pt, pt, //! Transverse momentum in GeV/c
+                           [](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float {
+                             return RecoDecay::sqrtSumOfSquares(pxPos + pxNeg, pyPos + pyNeg);
+                           });
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, //! Total momentum in GeV/c
+                           [](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
+                             return RecoDecay::sqrtSumOfSquares(pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg);
+                           });
+DECLARE_SOA_DYNAMIC_COLUMN(Phi, phi, //! Phi in the range [0, 2pi)
+                           [](float pxPos, float pyPos, float pxNeg, float pyNeg) -> float { return RecoDecay::phi(pxPos + pxNeg, pyPos + pyNeg); });
+DECLARE_SOA_DYNAMIC_COLUMN(Eta, eta, //! Pseudorapidity, conditionally defined to avoid FPEs
+                           [](float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg) -> float {
+                             return RecoDecay::eta(std::array{pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg});
+                           });
+// Length quantities
+DECLARE_SOA_DYNAMIC_COLUMN(V0radius, v0radius, //! V0 decay radius (2D, centered at zero)
+                           [](float x, float y) -> float { return RecoDecay::sqrtSumOfSquares(x, y); });
+
+// Distance Over To Mom
+DECLARE_SOA_DYNAMIC_COLUMN(DistOverTotMom, distOverTotMom, //! PV to V0decay distance over total momentum
+                           [](float X, float Y, float Z, float pxPos, float pyPos, float pzPos, float pxNeg, float pyNeg, float pzNeg, float pvX, float pvY, float pvZ) {
+                             float p = RecoDecay::sqrtSumOfSquares(pxPos + pxNeg, pyPos + pyNeg, pzPos + pzNeg);
+                             return std::sqrt(std::pow(X - pvX, 2) + std::pow(Y - pvY, 2) + std::pow(Z - pvZ, 2)) / (p + 1E-10);
+                           });
+
+// Armenteros-Podolanski variables
+DECLARE_SOA_DYNAMIC_COLUMN(Alpha, alpha, //! Armenteros Alpha
+                           [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) {
+                             float momTot = RecoDecay::p(pxpos + pxneg, pypos + pyneg, pzpos + pzneg);
+                             float lQlNeg = RecoDecay::dotProd(std::array{pxneg, pyneg, pzneg}, std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}) / momTot;
+                             float lQlPos = RecoDecay::dotProd(std::array{pxpos, pypos, pzpos}, std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}) / momTot;
+                             return (lQlPos - lQlNeg) / (lQlPos + lQlNeg); // alphav0
+                           });
+
+DECLARE_SOA_DYNAMIC_COLUMN(QtArm, qtArm, //! Armenteros Qt
+                           [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) {
+                             float momTot = RecoDecay::p2(pxpos + pxneg, pypos + pyneg, pzpos + pzneg);
+                             float dp = RecoDecay::dotProd(std::array{pxneg, pyneg, pzneg}, std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg});
+                             return std::sqrt(RecoDecay::p2(pxneg, pyneg, pzneg) - dp * dp / momTot); // qtarm
+                           });
+// Mass assumption
+DECLARE_SOA_DYNAMIC_COLUMN(MLambda, mLambda, //! mass under lambda hypothesis
+                           [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
+                             return RecoDecay::m(std::array{std::array{pxpos, pypos, pzpos}, std::array{pxneg, pyneg, pzneg}}, std::array{o2::constants::physics::MassProton, o2::constants::physics::MassPionCharged});
+                           });
+DECLARE_SOA_DYNAMIC_COLUMN(MAntiLambda, mAntiLambda, //! mass under antilambda hypothesis
+                           [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
+                             return RecoDecay::m(std::array{std::array{pxpos, pypos, pzpos}, std::array{pxneg, pyneg, pzneg}}, std::array{o2::constants::physics::MassPionCharged, o2::constants::physics::MassProton});
+                           });
+DECLARE_SOA_DYNAMIC_COLUMN(MK0Short, mK0Short, //! mass under K0short hypothesis
+                           [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
+                             return RecoDecay::m(std::array{std::array{pxpos, pypos, pzpos}, std::array{pxneg, pyneg, pzneg}}, std::array{o2::constants::physics::MassPionCharged, o2::constants::physics::MassPionCharged});
+                           });
+// Rapidity
+DECLARE_SOA_DYNAMIC_COLUMN(YK0Short, yK0Short, //! V0 y with K0short hypothesis
+                           [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
+                             return RecoDecay::y(std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassKaonNeutral);
+                           });
+DECLARE_SOA_DYNAMIC_COLUMN(YLambda, yLambda, //! V0 y with lambda or antilambda hypothesis
+                           [](float pxpos, float pypos, float pzpos, float pxneg, float pyneg, float pzneg) -> float {
+                             return RecoDecay::y(std::array{pxpos + pxneg, pypos + pyneg, pzpos + pzneg}, o2::constants::physics::MassLambda);
+                           });
+// Daughter track momenta
+DECLARE_SOA_DYNAMIC_COLUMN(NegativePt, negativePt, //! negative daughter pT
+                           [](float pxneg, float pyneg) -> float { return RecoDecay::sqrtSumOfSquares(pxneg, pyneg); });
+DECLARE_SOA_DYNAMIC_COLUMN(PositivePt, positivePt, //! positive daughter pT
+                           [](float pxpos, float pypos) -> float { return RecoDecay::sqrtSumOfSquares(pxpos, pypos); });
+DECLARE_SOA_DYNAMIC_COLUMN(NegativeEta, negativeEta, //! negative daughter eta
+                           [](float PxNeg, float PyNeg, float PzNeg) -> float { return RecoDecay::eta(std::array{PxNeg, PyNeg, PzNeg}); });
+DECLARE_SOA_DYNAMIC_COLUMN(NegativePhi, negativePhi, //! negative daughter phi
+                           [](float PxNeg, float PyNeg) -> float { return RecoDecay::phi(PxNeg, PyNeg); });
+DECLARE_SOA_DYNAMIC_COLUMN(PositiveEta, positiveEta, //! positive daughter eta
+                           [](float PxPos, float PyPos, float PzPos) -> float { return RecoDecay::eta(std::array{PxPos, PyPos, PzPos}); });
+DECLARE_SOA_DYNAMIC_COLUMN(PositivePhi, positivePhi, //! positive daughter phi
+                           [](float PxPos, float PyPos) -> float { return RecoDecay::phi(PxPos, PyPos); });
+} // namespace candidatev0
+DECLARE_SOA_TABLE(V0CandidateIndices, "AOD", "V0CANDIDATEINDEX", //! index table
+                  o2::soa::Index<>, candidatev0::CollisionId, candidatev0::PosTrackId, candidatev0::NegTrackId, candidatev0::McParticleId);
+
+DECLARE_SOA_TABLE(V0CandidateCores, "AOD", "V0CANDIDATECORE",
+                  o2::soa::Index<>,
+                  candidatev0::X, candidatev0::Y, candidatev0::Z,
+                  candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos,
+                  candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg,
+                  candidatev0::DcaV0Daughters, candidatev0::DcaPosToPV, candidatev0::DcaNegToPV,
+                  candidatev0::CosPA, candidatev0::DcaV0ToPV,
+                  candidatev0::Px<candidatev0::PxPos, candidatev0::PxNeg>,
+                  candidatev0::Py<candidatev0::PyPos, candidatev0::PyNeg>,
+                  candidatev0::Pz<candidatev0::PzPos, candidatev0::PzNeg>,
+                  candidatev0::Pt<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PxNeg, candidatev0::PyNeg>,
+                  candidatev0::P<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::Phi<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PxNeg, candidatev0::PyNeg>,
+                  candidatev0::Eta<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::V0radius<candidatev0::X, candidatev0::Y>,
+                  candidatev0::DistOverTotMom<candidatev0::X, candidatev0::Y, candidatev0::Z, candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::Alpha<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::QtArm<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::MLambda<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::MAntiLambda<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::MK0Short<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::YK0Short<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::YLambda<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos, candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::NegativePt<candidatev0::PxNeg, candidatev0::PyNeg>,
+                  candidatev0::PositivePt<candidatev0::PxPos, candidatev0::PyPos>,
+                  candidatev0::NegativeEta<candidatev0::PxNeg, candidatev0::PyNeg, candidatev0::PzNeg>,
+                  candidatev0::NegativePhi<candidatev0::PxNeg, candidatev0::PyNeg>,
+                  candidatev0::PositiveEta<candidatev0::PxPos, candidatev0::PyPos, candidatev0::PzPos>,
+                  candidatev0::PositivePhi<candidatev0::PxPos, candidatev0::PyPos>);
+
+using V0CandidateCore = V0CandidateCores::iterator;
+} // namespace o2::aod
 #endif // ALICE3_DATAMODEL_OTFSTRANGENESS_H_

ALICE3/TableProducer/CMakeLists.txt

@@ -60,3 +60,8 @@ o2physics_add_dpl_workflow(alice3-tracking-translator
                     SOURCES alice3TrackingTranslator.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(alice3strangenessfinder
+                    SOURCES alice3strangenessFinder.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)

ALICE3/TableProducer/OTF/onTheFlyDetectorGeometryProvider.cxx

@@ -20,14 +20,15 @@
 
 #include <CCDB/BasicCCDBManager.h>
 #include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
 #include <Framework/runDataProcessing.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 struct OnTheFlyDetectorGeometryProvider {
-
+  o2::framework::HistogramRegistry histos{"Histos", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject};
   o2::framework::Configurable<std::vector<std::string>> detectorConfiguration{"detectorConfiguration",
                                                                               std::vector<std::string>{"$O2PHYSICS_ROOT/share/alice3/a3geometry_v3.ini"},
                                                                               "Paths of the detector geometry configuration files"};
@@ -45,6 +46,7 @@ struct OnTheFlyDetectorGeometryProvider {
     int idx = 0;
     for (auto& configFile : detectorConfiguration.value) {
       LOG(info) << "Loading detector geometry from configuration file: " << configFile;
+      histos.add<TH1>(Form("GeometryConfigFile_%d", idx), configFile.c_str(), o2::framework::HistType::kTH1D, {{1, 0, 1}})->Fill(0.5);
       // If the filename starts with ccdb: then take the file from the ccdb
       if (configFile.rfind("ccdb:", 0) == 0) {
         std::string ccdbPath = configFile.substr(5); // remove "ccdb:" prefix
@@ -75,10 +77,12 @@ struct OnTheFlyDetectorGeometryProvider {
         LOG(fatal) << "Inconsistent magnetic field values between configurations 0 and " << icfg << ": " << mMagneticField << " vs " << cfgBfield;
       }
     }
+    LOG(info) << "Initialization completed";
   }
 
-  void process(o2::aod::McCollisions const&)
+  void process(o2::aod::McCollisions const& mcCollisions, o2::aod::McParticles const& mcParticles)
   {
+    LOG(info) << "On-the-fly detector geometry provider processing " << mcCollisions.size() << " collisions and " << mcParticles.size() << " particles.";
   }
 };