Use the recommended API for collision data access

Author: pnwkw

EventVisualisation/Workflow/include/EveWorkflow/AO2DConverter.h

@@ -41,11 +41,13 @@ struct AO2DConverter {
   o2::framework::Configurable<std::string> jsonPath{"jsons-folder", "./json", "name of the folder to store json files"};
 
   static constexpr float mWorkflowVersion = 1.00;
-  o2::header::DataHeader::RunNumberType mRunNumber = 1;
+  o2::header::DataHeader::RunNumberType mRunNumber = 0;
+  o2::header::DataHeader::TFCounterType mTfCounter = 0;
+  o2::header::DataHeader::TForbitType mTfOrbit = 0;
   o2::framework::DataProcessingHeader::CreationTime mCreationTime;
 
   void init(o2::framework::InitContext& ic);
-  void process(o2::aod::Collisions const& collisions, EveWorkflowHelper::AODBarrelTracks const& barrelTracks, EveWorkflowHelper::AODForwardTracks const& fwdTracks, EveWorkflowHelper::AODMFTTracks const& mftTracks);
+  void process(o2::aod::Collision const& collision, EveWorkflowHelper::AODBarrelTracks const& barrelTracks, EveWorkflowHelper::AODForwardTracks const& fwdTracks, EveWorkflowHelper::AODMFTTracks const& mftTracks);
 
   DetectorData mData;
   std::shared_ptr<EveWorkflowHelper> mHelper;

EventVisualisation/Workflow/include/EveWorkflow/EveWorkflowHelper.h

@@ -139,7 +139,7 @@ class EveWorkflowHelper
   static std::vector<PNT> getTrackPoints(const o2::track::TrackPar& trc, float minR, float maxR, float maxStep, float minZ = -25000, float maxZ = 25000);
   void selectTracks(const CalibObjectsConst* calib, GID::mask_t maskCl,
                     GID::mask_t maskTrk, GID::mask_t maskMatch, bool trackSorting);
-  void addTrackToEvent(const o2::track::TrackParCov& tr, GID gid, float trackTime, float dz, GID::Source source = GID::NSources, float maxStep = 4.f);
+  void addTrackToEvent(const o2::track::TrackPar& tr, GID gid, float trackTime, float dz, GID::Source source = GID::NSources, float maxStep = 4.f);
   void draw();
   void drawTPC(GID gid, float trackTime);
   void drawITS(GID gid, float trackTime);

EventVisualisation/Workflow/include/EveWorkflow/FileProducer.h

@@ -31,7 +31,7 @@ class FileProducer
   std::string mName;
 
  public:
-  explicit FileProducer(const std::string& path, int filesInFolder = 10,
+  explicit FileProducer(const std::string& path, int filesInFolder = -1,
                         const std::string& name = "tracks_{hostname}_{pid}_{timestamp}.json");
 
   [[nodiscard]] std::string newFileName() const;

EventVisualisation/Workflow/src/AO2DConverter.cxx

@@ -40,23 +40,24 @@ void AO2DConverter::init(o2::framework::InitContext& ic)
   mHelper = std::make_shared<EveWorkflowHelper>();
 }
 
-void AO2DConverter::process(o2::aod::Collisions const& collisions, EveWorkflowHelper::AODBarrelTracks const& barrelTracks, EveWorkflowHelper::AODForwardTracks const& fwdTracks, EveWorkflowHelper::AODMFTTracks const& mftTracks)
+void AO2DConverter::process(o2::aod::Collision const& collision, EveWorkflowHelper::AODBarrelTracks const& barrelTracks, EveWorkflowHelper::AODForwardTracks const& fwdTracks, EveWorkflowHelper::AODMFTTracks const& mftTracks)
 {
-  for (auto const& c : collisions) {
-    auto const barrelTracksForCol = barrelTracks.sliceBy(aod::track::collisionId, c.globalIndex());
-    auto const mftTracksForCol = mftTracks.sliceBy(aod::fwdtrack::collisionId, c.globalIndex());
+  for (auto const& track : barrelTracks) {
+    mHelper->drawAODBarrel(track, collision.collisionTime());
+  }
 
-    for (auto const& track : barrelTracksForCol) {
-      mHelper->drawAODBarrel(track, c.collisionTime());
-    }
+  for (auto const& track : mftTracks) {
+    mHelper->drawAODMFT(track, collision.collisionTime());
+  }
 
-    for (auto const& track : mftTracksForCol) {
-      mHelper->drawAODMFT(track, c.collisionTime());
-    }
+  mHelper->mEvent.setClMask(GlobalTrackID::MASK_NONE.to_ulong());
+  mHelper->mEvent.setTrkMask(GlobalTrackID::MASK_ALL.to_ulong());
+  mHelper->mEvent.setRunNumber(mRunNumber);
+  mHelper->mEvent.setTfCounter(mTfCounter);
+  mHelper->mEvent.setFirstTForbit(mTfOrbit);
 
-    mHelper->save(jsonPath, collisions.size(), GlobalTrackID::MASK_ALL, GlobalTrackID::MASK_NONE, mRunNumber, mCreationTime);
-    mHelper->clear();
-  }
+  mHelper->save(jsonPath, -1, GlobalTrackID::MASK_ALL, GlobalTrackID::MASK_NONE, mRunNumber, collision.collisionTime());
+  mHelper->clear();
 }
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

EventVisualisation/Workflow/src/EveWorkflowHelper.cxx

@@ -269,7 +269,7 @@ std::vector<PNT> EveWorkflowHelper::getTrackPoints(const o2::track::TrackPar& tr
   return pnts;
 }
 
-void EveWorkflowHelper::addTrackToEvent(const o2::track::TrackParCov& tr, GID gid, float trackTime, float dz, GID::Source source, float maxStep)
+void EveWorkflowHelper::addTrackToEvent(const o2::track::TrackPar& tr, GID gid, float trackTime, float dz, GID::Source source, float maxStep)
 {
   if (source == GID::NSources) {
     source = (o2::dataformats::GlobalTrackID::Source)gid.getSource();
@@ -403,14 +403,8 @@ void EveWorkflowHelper::drawAODBarrel(EveWorkflowHelper::AODBarrelTrack const& t
 {
   std::array<float, 5> const arraypar = {track.y(), track.z(), track.snp(),
                                          track.tgl(), track.signed1Pt()};
-  std::array<float, 15> const covpar = {track.cYY(), track.cZY(), track.cZZ(),
-                                        track.cSnpY(), track.cSnpZ(),
-                                        track.cSnpSnp(), track.cTglY(), track.cTglZ(),
-                                        track.cTglSnp(), track.cTglTgl(),
-                                        track.c1PtY(), track.c1PtZ(), track.c1PtSnp(),
-                                        track.c1PtTgl(), track.c1Pt21Pt2()};
-
-  auto const tr = o2::track::TrackParCov(track.x(), track.alpha(), arraypar, covpar);
+
+  auto const tr = o2::track::TrackPar(track.x(), track.alpha(), arraypar);
 
   addTrackToEvent(tr, GID{0, detectorMapToGIDSource(track.detectorMap())}, trackTime, 0.);
 }

EventVisualisation/Workflow/src/FileProducer.cxx

@@ -49,10 +49,13 @@ std::string FileProducer::newFileName() const
   auto result = fmt::format(this->mName, fmt::arg("hostname", hostname), fmt::arg("pid", pid), fmt::arg("timestamp", millisec_since_epoch));
   auto files = DirectoryLoader::load(this->mPath, "_"); // already sorted starting by part of name at pos
 
-  while (files.size() >= this->mFilesInFolder) {
-    auto front = files.front();
-    files.pop_front();
-    std::remove((this->mPath + "/" + front).c_str()); // delete file
+  if (this->mFilesInFolder > 0) {
+    while (files.size() >= this->mFilesInFolder) {
+      auto front = files.front();
+      files.pop_front();
+      std::remove((this->mPath + "/" + front).c_str()); // delete file
+    }
   }
+
   return this->mPath + "/" + result;
 }