Merge branch 'master' of github.com:miedema-11/O2Physics

Author: miedema-11

ALICE3/Core/ALICE3CoreLinkDef.h

@@ -14,3 +14,5 @@
 #pragma link off all functions;
 
 #pragma link C++ class o2::pid::tof::TOFResoALICE3 + ;
+#pragma link C++ class std::vector < std::vector < unsigned int>> + ;
+#pragma link C++ class std::vector < std::vector < std::uint32_t>> + ;

ALICE3/DataModel/OTFMulticharm.h

@@ -75,31 +75,6 @@ DECLARE_SOA_COLUMN(XicProperLength, xicProperLength, float);
 DECLARE_SOA_COLUMN(XicDistanceFromPV, xicDistanceFromPV, float);
 DECLARE_SOA_COLUMN(XiccProperLength, xiccProperLength, float);
 
-// PID
-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);
 DECLARE_SOA_COLUMN(PosEta, posEta, float);
@@ -159,31 +134,6 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
                   otfmulticharm::PiccPt,
                   otfmulticharm::LUTConfigId);
 
-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,

ALICE3/DataModel/tracksAlice3.h

@@ -21,6 +21,7 @@
 
 // O2 includes
 #include "Framework/AnalysisDataModel.h"
+#include <Framework/ASoA.h>
 
 namespace o2::aod
 {
@@ -29,16 +30,30 @@ namespace track_alice3
 DECLARE_SOA_COLUMN(IsReconstructed, isReconstructed, bool); //! is reconstructed or not
 DECLARE_SOA_COLUMN(NSiliconHits, nSiliconHits, int);        //! number of silicon hits
 DECLARE_SOA_COLUMN(NTPCHits, nTPCHits, int);                //! number of tpc hits
+DECLARE_SOA_COLUMN(PdgCode, pdgCode, int);                  //! PDG code of the linked truth MC particle
 } // namespace track_alice3
 DECLARE_SOA_TABLE(TracksAlice3, "AOD", "TRACKSALICE3",
                   track_alice3::IsReconstructed);
 using TrackAlice3 = TracksAlice3::iterator;
 
+DECLARE_SOA_TABLE(TracksAlice3Pdg, "AOD", "TRACKSALICE3PDG",
+                  track_alice3::PdgCode);
+using TrackAlice3Pdg = TracksAlice3Pdg::iterator;
+
 DECLARE_SOA_TABLE(TracksExtraA3, "AOD", "TracksExtraA3",
                   track_alice3::NSiliconHits,
                   track_alice3::NTPCHits);
 using TrackExtraA3 = TracksExtraA3::iterator;
 
+namespace mcparticle_alice3
+{
+DECLARE_SOA_COLUMN(NHits, nHits, int);     //! number of silicon hits
+DECLARE_SOA_COLUMN(Charge, charge, float); //! particle charge
+} // namespace mcparticle_alice3
+DECLARE_SOA_TABLE(MCParticlesExtraA3, "AOD", "MCParticlesExtraA3",
+                  mcparticle_alice3::NHits,
+                  mcparticle_alice3::Charge);
+using MCParticleExtraA3 = MCParticlesExtraA3::iterator;
 } // namespace o2::aod
 
 #endif // ALICE3_DATAMODEL_TRACKSALICE3_H_

ALICE3/TableProducer/CMakeLists.txt

@@ -58,7 +58,7 @@ o2physics_add_dpl_workflow(alice3-hf-tree-creator-3prong
 
 o2physics_add_dpl_workflow(alice3-tracking-translator
                     SOURCES alice3TrackingTranslator.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::ALICE3Core
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(alice3-dq-table-maker
@@ -68,5 +68,5 @@ o2physics_add_dpl_workflow(alice3-dq-table-maker
 
 o2physics_add_dpl_workflow(alice3strangenessfinder
                     SOURCES alice3strangenessFinder.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::ALICE3Core
                     COMPONENT_NAME Analysis)