Add particle MC ID + ITS chi2/Ncls in derived data + extra event selections in the analysis task

PWGLF/DataModel/LFStrangenessTables.h

@@ -89,11 +89,16 @@ namespace dautrack
 {
 //______________________________________________________
 // Daughter track declarations for derived data analysis
+DECLARE_SOA_COLUMN(ITSChi2PerNcl, itsChi2PerNcl, float);        //! ITS chi2 per N cluster
 DECLARE_SOA_COLUMN(DetectorMap, detectorMap, uint8_t);          //! detector map for reference (see DetectorMapEnum)
 DECLARE_SOA_COLUMN(ITSClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer
 DECLARE_SOA_COLUMN(TPCClusters, tpcClusters, uint8_t);          //! N TPC clusters
 DECLARE_SOA_COLUMN(TPCCrossedRows, tpcCrossedRows, uint8_t);    //! N TPC clusters
 
+//______________________________________________________
+// Daughter track MC information
+DECLARE_SOA_COLUMN(ParticleMCId, particleMCId, int); //! particle MC Id
+
 //______________________________________________________
 // for extras: replicated here to ensure ease of manipulating the ITS information
 // directly from the V0 extras table in simple ways for derived data as well
@@ -126,7 +131,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(HasTOF, hasTOF, //! Flag to check if track has a TOF
                            [](uint8_t detectorMap) -> bool { return detectorMap & o2::aod::track::TOF; });
 } // namespace dautrack
 
-DECLARE_SOA_TABLE(DauTrackExtras, "AOD", "DAUTRACKEXTRA", //! detector properties of decay daughters
+DECLARE_SOA_TABLE(DauTrackExtras_000, "AOD", "DAUTRACKEXTRA", //! detector properties of decay daughters
                   dautrack::DetectorMap, dautrack::ITSClusterSizes,
                   dautrack::TPCClusters, dautrack::TPCCrossedRows,
 
@@ -138,6 +143,23 @@ DECLARE_SOA_TABLE(DauTrackExtras, "AOD", "DAUTRACKEXTRA", //! detector propertie
                   dautrack::HasTRD<dautrack::DetectorMap>,
                   dautrack::HasTOF<dautrack::DetectorMap>);
 
+DECLARE_SOA_TABLE_VERSIONED(DauTrackExtras_001, "AOD", "DAUTRACKEXTRA", 1, //! detector properties of decay daughters
+                            dautrack::ITSChi2PerNcl,
+                            dautrack::DetectorMap, dautrack::ITSClusterSizes,
+                            dautrack::TPCClusters, dautrack::TPCCrossedRows,
+
+                            // Dynamic columns for manipulating information
+                            dautrack::ITSClusterMap<dautrack::ITSClusterSizes>,
+                            dautrack::ITSNCls<dautrack::ITSClusterSizes>,
+                            dautrack::HasITS<dautrack::DetectorMap>,
+                            dautrack::HasTPC<dautrack::DetectorMap>,
+                            dautrack::HasTRD<dautrack::DetectorMap>,
+                            dautrack::HasTOF<dautrack::DetectorMap>);
+
+DECLARE_SOA_TABLE(DauTrackMCIds, "AOD", "DAUTRACKMCID", // index table when using AO2Ds
+                  dautrack::ParticleMCId);
+
+using DauTrackExtras = DauTrackExtras_001;
 using DauTrackExtra = DauTrackExtras::iterator;
 
 namespace motherParticle
@@ -232,6 +254,7 @@ DECLARE_SOA_COLUMN(KFV0Chi2, kfV0Chi2, float); //!
 
 //______________________________________________________
 // REGULAR COLUMNS FOR V0MCCORES
+DECLARE_SOA_COLUMN(ParticleIdMC, particleIdMC, int);            //! V0 Particle ID
 DECLARE_SOA_COLUMN(PDGCode, pdgCode, int);                      //! V0 PDG Code
 DECLARE_SOA_COLUMN(PDGCodeMother, pdgCodeMother, int);          //! V0 mother PDG code (for feeddown)
 DECLARE_SOA_COLUMN(PDGCodePositive, pdgCodePositive, int);      //! V0 positive prong PDG code
@@ -551,13 +574,21 @@ DECLARE_SOA_EXTENDED_TABLE_USER(V0fCCores, StoredV0fCCores, "V0FCCOREEXT",
 DECLARE_SOA_TABLE_FULL(V0fCCovs, "V0fCCovs", "AOD", "V0FCCOVS", //! V0 covariance matrices
                        v0data::PositionCovMat, v0data::MomentumCovMat, o2::soa::Marker<2>);
 
-DECLARE_SOA_TABLE(V0MCCores, "AOD", "V0MCCORE", //! MC properties of the V0 for posterior analysis
+DECLARE_SOA_TABLE(V0MCCores_000, "AOD", "V0MCCORE", //! MC properties of the V0 for posterior analysis
                   v0data::PDGCode, v0data::PDGCodeMother,
                   v0data::PDGCodePositive, v0data::PDGCodeNegative,
                   v0data::IsPhysicalPrimary, v0data::XMC, v0data::YMC, v0data::ZMC,
                   v0data::PxPosMC, v0data::PyPosMC, v0data::PzPosMC,
                   v0data::PxNegMC, v0data::PyNegMC, v0data::PzNegMC);
 
+DECLARE_SOA_TABLE_VERSIONED(V0MCCores_001, "AOD", "V0MCCORE", 1, //! debug information
+                            v0data::ParticleIdMC,                //! MC properties of the V0 for posterior analysis
+                            v0data::PDGCode, v0data::PDGCodeMother,
+                            v0data::PDGCodePositive, v0data::PDGCodeNegative,
+                            v0data::IsPhysicalPrimary, v0data::XMC, v0data::YMC, v0data::ZMC,
+                            v0data::PxPosMC, v0data::PyPosMC, v0data::PzPosMC,
+                            v0data::PxNegMC, v0data::PyNegMC, v0data::PzNegMC);
+
 DECLARE_SOA_TABLE(V0MCCollRefs, "AOD", "V0MCCOLLREF", //! refers MC candidate back to proper MC Collision
                   o2::soa::Index<>, v0data::StraMCCollisionId, o2::soa::Marker<2>);
 
@@ -568,6 +599,7 @@ DECLARE_SOA_TABLE(GeAntiLambda, "AOD", "GeAntiLambda", v0data::GeneratedAntiLamb
 DECLARE_SOA_TABLE(V0MCMothers, "AOD", "V0MCMOTHER", //! optional table for MC mothers
                   o2::soa::Index<>, v0data::MotherMCPartId);
 
+using V0MCCores = V0MCCores_001;
 using V0Index = V0Indices::iterator;
 using V0Core = V0Cores::iterator;
 using V0TrackX = V0TrackXs::iterator;

PWGLF/TableProducer/Strangeness/lambdakzeromcbuilder.cxx

@@ -104,7 +104,7 @@ struct lambdakzeromcbuilder {
         lLabel, lMotherLabel);
       if (populateV0MCCores) {
         v0mccores(
-          pdgCode, pdgCodeMother, pdgCodePositive, pdgCodeNegative,
+          lLabel, pdgCode, pdgCodeMother, pdgCodePositive, pdgCodeNegative,
           isPhysicalPrimary, xmc, ymc, zmc,
           pxposmc, pyposmc, pzposmc,
           pxnegmc, pynegmc, pznegmc);

PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

@@ -86,6 +86,7 @@ struct strangederivedbuilder {
   //__________________________________________________
   // track extra references
   Produces<aod::DauTrackExtras> dauTrackExtras;   // daughter track detector properties
+  Produces<aod::DauTrackMCIds> dauTrackMCIds;     // daughter track MC Particle ID
   Produces<aod::DauTrackTPCPIDs> dauTrackTPCPIDs; // daughter track TPC PID
   Produces<aod::DauTrackTOFPIDs> dauTrackTOFPIDs; // daughter track TOF PID
   Produces<aod::V0Extras> v0Extras;               // references DauTracks from V0s
@@ -449,53 +450,55 @@ struct strangederivedbuilder {
     // circle back and populate actual DauTrackExtra table
     for (auto const& tr : tracksExtra) {
       if (trackMap[tr.globalIndex()] >= 0) {
-        dauTrackExtras(tr.detectorMap(), tr.itsClusterSizes(),
+        dauTrackExtras(tr.itsChi2NCl(),
+                       tr.detectorMap(), tr.itsClusterSizes(),
                        tr.tpcNClsFound(), tr.tpcNClsCrossedRows());
       }
     }
     // done!
   }
 
-  void processTrackExtras(aod::V0Datas const& V0s, aod::CascDatas const& Cascades, aod::KFCascDatas const& KFCascades, aod::TraCascDatas const& TraCascades, TracksWithExtra const& tracksExtra, aod::V0s const&)
+  template <typename V0Datas, typename CascDatas, typename KFCascDatas, typename TraCascDatas, typename tracksWithExtra>
+  void fillTrackExtras(V0Datas const& V0s, CascDatas const& Cascades, KFCascDatas const& KFCascades, TraCascDatas const& TraCascades, tracksWithExtra const& tracksExtra)
   {
     std::vector<int> trackMap(tracksExtra.size(), -1); // index -1: not used
 
     //__________________________________________________
     // mark tracks that belong to V0s
     for (auto const& v0 : V0s) {
-      auto const& posTrack = v0.posTrack_as<TracksWithExtra>();
-      auto const& negTrack = v0.negTrack_as<TracksWithExtra>();
+      auto const& posTrack = v0.template posTrack_as<tracksWithExtra>();
+      auto const& negTrack = v0.template negTrack_as<tracksWithExtra>();
       trackMap[posTrack.globalIndex()] = 0;
       trackMap[negTrack.globalIndex()] = 0;
     }
 
     //__________________________________________________
     // index tracks that belong to CascDatas
     for (auto const& casc : Cascades) {
-      auto bachTrack = casc.bachelor_as<TracksWithExtra>();
-      auto posTrack = casc.posTrack_as<TracksWithExtra>();
-      auto negTrack = casc.negTrack_as<TracksWithExtra>();
+      auto bachTrack = casc.template bachelor_as<tracksWithExtra>();
+      auto posTrack = casc.template posTrack_as<tracksWithExtra>();
+      auto negTrack = casc.template negTrack_as<tracksWithExtra>();
       trackMap[posTrack.globalIndex()] = 0;
       trackMap[negTrack.globalIndex()] = 0;
       trackMap[bachTrack.globalIndex()] = 0;
     }
     //__________________________________________________
     // index tracks that belong to KFCascDatas
     for (auto const& casc : KFCascades) {
-      auto bachTrack = casc.bachelor_as<TracksWithExtra>();
-      auto posTrack = casc.posTrack_as<TracksWithExtra>();
-      auto negTrack = casc.negTrack_as<TracksWithExtra>();
+      auto bachTrack = casc.template bachelor_as<tracksWithExtra>();
+      auto posTrack = casc.template posTrack_as<tracksWithExtra>();
+      auto negTrack = casc.template negTrack_as<tracksWithExtra>();
       trackMap[posTrack.globalIndex()] = 0;
       trackMap[negTrack.globalIndex()] = 0;
       trackMap[bachTrack.globalIndex()] = 0;
     }
     //__________________________________________________
     // index tracks that belong to TraCascDatas
     for (auto const& casc : TraCascades) {
-      auto bachTrack = casc.bachelor_as<TracksWithExtra>();
-      auto posTrack = casc.posTrack_as<TracksWithExtra>();
-      auto negTrack = casc.negTrack_as<TracksWithExtra>();
-      auto strangeTrack = casc.strangeTrack_as<TracksWithExtra>();
+      auto bachTrack = casc.template bachelor_as<tracksWithExtra>();
+      auto posTrack = casc.template posTrack_as<tracksWithExtra>();
+      auto negTrack = casc.template negTrack_as<tracksWithExtra>();
+      auto strangeTrack = casc.template strangeTrack_as<tracksWithExtra>();
       trackMap[posTrack.globalIndex()] = 0;
       trackMap[negTrack.globalIndex()] = 0;
       trackMap[bachTrack.globalIndex()] = 0;
@@ -513,34 +516,41 @@ struct strangederivedbuilder {
     //__________________________________________________
     // populate track references
     for (auto const& v0 : V0s) {
-      auto const& posTrack = v0.posTrack_as<TracksWithExtra>();
-      auto const& negTrack = v0.negTrack_as<TracksWithExtra>();
+      auto const& posTrack = v0.template posTrack_as<tracksWithExtra>();
+      auto const& negTrack = v0.template negTrack_as<tracksWithExtra>();
       v0Extras(trackMap[posTrack.globalIndex()],
                trackMap[negTrack.globalIndex()]); // joinable with V0Datas
     }
     //__________________________________________________
     // populate track references
     for (auto const& casc : Cascades) {
-      auto bachTrack = casc.bachelor_as<TracksWithExtra>();
-      auto posTrack = casc.posTrack_as<TracksWithExtra>();
-      auto negTrack = casc.negTrack_as<TracksWithExtra>();
+      auto bachTrack = casc.template bachelor_as<tracksWithExtra>();
+      auto posTrack = casc.template posTrack_as<tracksWithExtra>();
+      auto negTrack = casc.template negTrack_as<tracksWithExtra>();
       cascExtras(trackMap[posTrack.globalIndex()],
                  trackMap[negTrack.globalIndex()],
                  trackMap[bachTrack.globalIndex()]); // joinable with CascDatas
     }
     //__________________________________________________
     // populate track references
     for (auto const& casc : TraCascades) {
-      auto strangeTrack = casc.strangeTrack_as<TracksWithExtra>();
+      auto strangeTrack = casc.template strangeTrack_as<tracksWithExtra>();
       straTrackExtras(trackMap[strangeTrack.globalIndex()]); // joinable with TraCascDatas
     }
     //__________________________________________________
     // circle back and populate actual DauTrackExtra table
     for (auto const& tr : tracksExtra) {
       if (trackMap[tr.globalIndex()] >= 0) {
-        dauTrackExtras(tr.detectorMap(), tr.itsClusterSizes(),
+        dauTrackExtras(tr.itsChi2NCl(),
+                       tr.detectorMap(), tr.itsClusterSizes(),
                        tr.tpcNClsFound(), tr.tpcNClsCrossedRows());
 
+        // if the table has MC info
+        if constexpr (requires { tr.mcParticle(); }) {
+          // do your thing with the mcParticleIds only in case the table has the MC info
+          dauTrackMCIds(tr.mcParticleId()); // joinable with dauTrackExtras
+        }
+
         // round if requested
         if (roundNSigmaVariables) {
           dauTrackTPCPIDs(tr.tpcSignal(),
@@ -562,6 +572,18 @@ struct strangederivedbuilder {
     // done!
   }
 
+  void processTrackExtras(aod::V0Datas const& V0s, aod::CascDatas const& Cascades, aod::KFCascDatas const& KFCascades, aod::TraCascDatas const& TraCascades, soa::Join<aod::TracksIU, aod::TracksExtra, aod::pidTPCFullEl, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTPCFullHe, aod::TOFEvTime, aod::TOFSignal> const& tracksExtra, aod::V0s const&)
+  {
+    fillTrackExtras(V0s, Cascades, KFCascades, TraCascades, tracksExtra);
+    // done!
+  }
+
+  void processTrackExtrasMC(aod::V0Datas const& V0s, aod::CascDatas const& Cascades, aod::KFCascDatas const& KFCascades, aod::TraCascDatas const& TraCascades, soa::Join<aod::TracksIU, aod::TracksExtra, aod::McTrackLabels, aod::pidTPCFullEl, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTPCFullHe, aod::TOFEvTime, aod::TOFSignal> const& tracksExtra, aod::V0s const&)
+  {
+    fillTrackExtras(V0s, Cascades, KFCascades, TraCascades, tracksExtra);
+    // done!
+  }
+
   void processStrangeMothers(soa::Join<aod::V0Datas, aod::McV0Labels> const& V0s, soa::Join<aod::CascDatas, aod::McCascLabels> const& Cascades, aod::McParticles const& mcParticles)
   {
     std::vector<int> motherReference(mcParticles.size(), -1); // index -1: not used / no reference
@@ -764,6 +786,7 @@ struct strangederivedbuilder {
   PROCESS_SWITCH(strangederivedbuilder, processCollisionsMC, "Produce collisions (V0s + casc)", false);
   PROCESS_SWITCH(strangederivedbuilder, processTrackExtrasV0sOnly, "Produce track extra information (V0s only)", true);
   PROCESS_SWITCH(strangederivedbuilder, processTrackExtras, "Produce track extra information (V0s + casc)", true);
+  PROCESS_SWITCH(strangederivedbuilder, processTrackExtrasMC, "Produce track extra information (V0s + casc)", false);
   PROCESS_SWITCH(strangederivedbuilder, processStrangeMothers, "Produce tables with mother info for V0s + casc", true);
   PROCESS_SWITCH(strangederivedbuilder, processCascadeInterlinkTracked, "Produce tables interconnecting cascades", false);
   PROCESS_SWITCH(strangederivedbuilder, processCascadeInterlinkKF, "Produce tables interconnecting cascades", false);

PWGLF/TableProducer/converters/CMakeLists.txt

@@ -9,12 +9,22 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-o2physics_add_dpl_workflow(stradautracksconverter
-                    SOURCES stradautracksconverter.cxx
+o2physics_add_dpl_workflow(stradautrackstofpidconverter
+                    SOURCES stradautrackstofpidconverter.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(stradautracksextraconverter
+                    SOURCES stradautracksextraconverter.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(strarawcentsconverter
                     SOURCES strarawcentsconverter.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(v0coresconverter
+                    SOURCES v0coresconverter.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)

PWGLF/TableProducer/converters/stradautracksextraconverter.cxx

@@ -0,0 +1,40 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/AnalysisDataModel.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
+#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+
+using namespace o2;
+using namespace o2::framework;
+
+// Converts V0 version 001 to 002
+struct stradautracksextraconverter {
+  Produces<aod::DauTrackExtras_001> dauTrackExtras_001;
+
+  void process(aod::DauTrackExtras_000 const& dauTrackExtras_000)
+  {
+    for (auto& values : dauTrackExtras_000) {
+      dauTrackExtras_001(0,
+                         values.detectorMap(),
+                         values.itsClusterSizes(),
+                         values.tpcClusters(),
+                         values.tpcCrossedRows());
+    }
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{
+    adaptAnalysisTask<stradautracksextraconverter>(cfgc)};
+}