Developments of data model and tasks for skimming and candidates creation in UD (#1021)

* [WIP] UD skimming developments

* [WIP] Add UD tables for skimming

* [WIP] UD skimming developments: do not dereference table pointers

* [WIP] UD skimming developments: rework MC information processing in skimmer, rework dimuon analysis

* [WIP] UD skimming developments: clang format

* [WIP] UD skimming developments: add skimming of barrel tracks and semiforward candidates

* [WIP] UD skimming developments: minor improvements of tables and analysis

* [WIP] UD skimming developments: add more code comments

* [WIP] UD skimming developments: switch to index columns for candidate IDs and add global BCs to tracks

* [WIP] UD skimming developments: rename tables, switch to propagated tracks

* [WIP] UD skimming developments: merge DGCandidates with UDTables and adapt DG tasks

* [WIP] UD skimming developments: rename skimmer and creator tasks

* UD skimming developments: fix typos, clang format

* UD skimming developments: fix typos, naming, rework UPC candidate analyzer

Author: nburmaso

PWGUD/CMakeLists.txt

@@ -13,4 +13,3 @@ add_subdirectory(Core)
 # add_subdirectory(DataModel)
 add_subdirectory(Tasks)
 add_subdirectory(TableProducer)
-

PWGUD/Core/DGPIDSelector.cxx

@@ -24,7 +24,7 @@ float particleMass(TDatabasePDG* pdg, int pid)
 };
 
 // -----------------------------------------------------------------------------
-DGParticle::DGParticle(TDatabasePDG* pdg, DGAnaparHolder anaPars, aod::DGTracks const& dgtracks, std::vector<uint> comb)
+DGParticle::DGParticle(TDatabasePDG* pdg, DGAnaparHolder anaPars, UDTracksFull const& tracks, std::vector<uint> comb)
 {
   // compute invariant mass
   TLorentzVector lvtmp;
@@ -35,8 +35,8 @@ DGParticle::DGParticle(TDatabasePDG* pdg, DGAnaparHolder anaPars, aod::DGTracks
   auto cnt = -1;
   for (auto ind : comb) {
     cnt++;
-    auto track = dgtracks.rawIteratorAt(ind);
-    lvtmp.SetPtEtaPhiM(track.pt(), track.eta(), track.phi(), particleMass(pdg, pidinfo[cnt * 12]));
+    auto track = tracks.rawIteratorAt(ind);
+    lvtmp.SetXYZM(track.px(), track.py(), track.pz(), particleMass(pdg, pidinfo[cnt * 12]));
     mIVM += lvtmp;
   }
 
@@ -60,7 +60,7 @@ DGPIDSelector::DGPIDSelector()
 }
 
 // -----------------------------------------------------------------------------
-float DGPIDSelector::getTPCnSigma(aod::DGTrack track, int hypo)
+float DGPIDSelector::getTPCnSigma(UDTrackFull track, int hypo)
 {
   switch (hypo) {
     case 0:
@@ -79,7 +79,7 @@ float DGPIDSelector::getTPCnSigma(aod::DGTrack track, int hypo)
 }
 
 // -----------------------------------------------------------------------------
-bool DGPIDSelector::isGoodTrack(aod::DGTrack track, int cnt)
+bool DGPIDSelector::isGoodTrack(UDTrackFull track, int cnt)
 {
   // extract PID information
   auto pidinfo = mAnaPars.TPCnSigmas();
@@ -121,30 +121,30 @@ bool DGPIDSelector::isGoodTrack(aod::DGTrack track, int cnt)
 }
 
 // -----------------------------------------------------------------------------
-int DGPIDSelector::computeIVMs(int nCombine, aod::DGTracks const& dgtracks)
+int DGPIDSelector::computeIVMs(int nCombine, UDTracksFull const& tracks)
 {
   // reset
   mIVMs.clear();
 
   // create combinations including permutations
-  auto combs = combinations(nCombine, dgtracks.size());
+  auto combs = combinations(nCombine, tracks.size());
 
   // loop over combinations
   for (auto comb : combs) {
-    // is dgtracks compatible with PID requirements?
+    // is tracks compatible with PID requirements?
     bool isGoodComb = true;
     auto cnt = -1;
     for (auto ind : comb) {
       cnt++;
-      if (!isGoodTrack(dgtracks.rawIteratorAt(ind), cnt)) {
+      if (!isGoodTrack(tracks.rawIteratorAt(ind), cnt)) {
         isGoodComb = false;
         break;
       }
     }
 
     // update list of IVMs
     if (isGoodComb) {
-      DGParticle IVM(fPDG, mAnaPars, dgtracks, comb);
+      DGParticle IVM(fPDG, mAnaPars, tracks, comb);
       mIVMs.push_back(IVM);
     }
   }

PWGUD/Core/DGPIDSelector.h

@@ -15,19 +15,22 @@
 #include <gandiva/projector.h>
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "PWGUD/DataModel/DGCandidates.h"
+#include "PWGUD/DataModel/UDTables.h"
 #include "DGAnaparHolder.h"
 
 using namespace o2;
 
+using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTrackCollisionIDs, aod::UDTracksPID>;
+using UDTrackFull = soa::Join<aod::UDTracks, aod::UDTrackCollisionIDs, aod::UDTracksPID>::iterator;
+
 float particleMass(TDatabasePDG* pdg, int pid);
 
 // -----------------------------------------------------------------------------
 // a structure which holds the indices of tracks and their invariant mass
 struct DGParticle {
  public:
   DGParticle() = default;
-  DGParticle(TDatabasePDG* pdg, DGAnaparHolder anaPars, aod::DGTracks const& dgtracks, std::vector<uint> comb);
+  DGParticle(TDatabasePDG* pdg, DGAnaparHolder anaPars, UDTracksFull const& tracks, std::vector<uint> comb);
 
   // getter
   std::vector<uint> trkinds() { return mtrkinds; }
@@ -60,9 +63,9 @@ struct DGPIDSelector {
 
   // getters
   std::vector<DGParticle> IVMs() { return mIVMs; }
-  float getTPCnSigma(aod::DGTrack track, int hypo);
-  bool isGoodTrack(aod::DGTrack track, int cnt);
-  int computeIVMs(int nCombine, aod::DGTracks const& dgtracks);
+  float getTPCnSigma(UDTrackFull track, int hypo);
+  bool isGoodTrack(UDTrackFull track, int cnt);
+  int computeIVMs(int nCombine, UDTracksFull const& tracks);
 
  private:
   // analysis parameters