Update data model

Author: romainschotter

Common/Tasks/propagatorQa.cxx

@@ -36,6 +36,7 @@
 #include <Framework/runDataProcessing.h>
 #include <MathUtils/Primitive2D.h>
 #include <ReconstructionDataFormats/Track.h>
+#include "Common/DataModel/CollisionAssociationTables.h"
 
 #include <TMath.h>
 #include <TMathBase.h>
@@ -216,14 +217,16 @@ struct propagatorQa {
     }
   }
 
-  void processMC(aod::Collision const& collision, aod::V0s const& V0s, aod::Cascades const& cascades, soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksDCA, aod::McTrackLabels> const& tracks, aod::BCsWithTimestamps const&, aod::McParticles const&)
+  void processMC(aod::Collision const& collision, aod::V0s const& V0s, aod::Cascades const& cascades, soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksDCA, aod::TrackCompColls, aod::McTrackLabels> const& tracks, aod::BCsWithTimestamps const&, aod::McParticles const&)
   {
     /* check the previous run number */
     auto bc = collision.bc_as<aod::BCsWithTimestamps>();
     initCCDB(bc);
     std::array<float, 2> dcaInfo;
 
     for (const auto& track : tracks) {
+      //if (track.compatibleCollIds().size() != 0)
+      //	continue;
       if (track.tpcNClsFound() < minTPCClustersRequired)
         continue;
 
@@ -336,14 +339,16 @@ struct propagatorQa {
   }
   PROCESS_SWITCH(propagatorQa, processMC, "process MC", true);
 
-  void processData(aod::Collision const& collision, aod::V0s const& V0s, aod::Cascades const& cascades, soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksDCA> const& tracks, aod::BCsWithTimestamps const&)
+  void processData(aod::Collision const& collision, aod::V0s const& V0s, aod::Cascades const& cascades, soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksDCA, aod::TrackCompColls> const& tracks, aod::BCsWithTimestamps const&)
   {
     /* check the previous run number */
     auto bc = collision.bc_as<aod::BCsWithTimestamps>();
     initCCDB(bc);
     std::array<float, 2> dcaInfo;
 
     for (const auto& track : tracks) {
+      //if (track.compatibleCollIds().size() != 0)
+      //  continue;
       if (track.tpcNClsFound() < minTPCClustersRequired)
         continue;
 

PWGLF/DataModel/LFStrangenessTables.h

@@ -66,6 +66,8 @@ DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNC, energyCommonZNC, //! get the total s
 
 // event time
 DECLARE_SOA_COLUMN(EventTime, eventTime, float); //! event time (FT0, TOF) for TOF PID (stored once per event)
+// event time error
+DECLARE_SOA_COLUMN(EventTimeErr, eventTimeErr, float); //! event time (FT0, TOF) for TOF PID (stored once per event)
 } // namespace stracollision
 
 //______________________________________________________
@@ -311,7 +313,7 @@ DECLARE_SOA_TABLE(StraStamps_000, "AOD", "STRASTAMPS", //! information for ID-in
                   bc::RunNumber, timestamp::Timestamp);
 DECLARE_SOA_TABLE_VERSIONED(StraStamps_001, "AOD", "STRASTAMPS", 1, //! information for ID-ing mag field if needed
                             bc::RunNumber, timestamp::Timestamp, bc::GlobalBC);
-DECLARE_SOA_TABLE(StraEvTimes, "AOD", "STRAEVTIMES", //! event time (FT0, TOF)
+DECLARE_SOA_TABLE(StraEvTimes_000, "AOD", "STRAEVTIMES", //! event time (FT0, TOF)
                   stracollision::EventTime);
 DECLARE_SOA_TABLE_VERSIONED(StraEvTimes_001, "AOD", "STRAEVTIMES", 1, //! event time (FT0, TOF)
                             stracollision::EventTime, stracollision::EventTimeErr);