o2-eve-display: added TRD,TOF,MID

added information fields to *.json file to recognise workflow parameters used to produce this json

Author: Julian Myrcha

EventVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEvent.h

@@ -46,7 +46,7 @@ class VisualisationEvent
   std::string toJson();
   void fromJson(std::string json);
   bool fromFile(std::string fileName);
-  VisualisationEvent() = default;
+  VisualisationEvent();
   VisualisationEvent(std::string fileName);
   VisualisationEvent(const VisualisationEvent& source, EVisualisationGroup filter);
   void toFile(std::string fileName);
@@ -106,19 +106,14 @@ class VisualisationEvent
     return mTracks.size();
   }
 
-  // Returns cluster with index i
-  const VisualisationCluster& getCluster(int i) const
-  {
-    return mClusters[i];
-  };
-
-  // Returns number of clusters
-  size_t getClusterCount() const
-  {
-    return mClusters.size();
-  }
+  const VisualisationCluster& getCluster(int i) const { return mClusters[i]; };
+  size_t getClusterCount() const { return mClusters.size(); } // Returns number of clusters
+  void setWorkflowVersion(float workflowVersion) { this->mWorkflowVersion = workflowVersion; }
+  void setWorkflowParameters(std::string workflowParameters) { this->mWorkflowParameters = workflowParameters; }
 
  private:
+  float mWorkflowVersion;                      /// workflow version used to generate this Event
+  std::string mWorkflowParameters;             /// workflow parameters used to generate this Event
   int mEventNumber;                            /// event number in file
   int mRunNumber;                              /// run number
   double mEnergy;                              /// energy of the collision

EventVisualisation/DataConverter/src/VisualisationEvent.cxx

@@ -101,6 +101,9 @@ std::string VisualisationEvent::toJson()
 
   // compatibility verification
   tree.AddMember("fileVersion", rapidjson::Value().SetInt(JSON_FILE_VERSION), allocator);
+  tree.AddMember("timeStamp", rapidjson::Value().SetFloat(this->mTimeStamp), allocator);
+  tree.AddMember("workflowVersion", rapidjson::Value().SetFloat(this->mWorkflowVersion), allocator);
+  tree.AddMember("workflowParameters", rapidjson::Value().SetString(this->mWorkflowParameters.c_str(), this->mWorkflowParameters.size()), allocator);
   // Tracks
   tree.AddMember("trackCount", rapidjson::Value().SetInt(this->getTrackCount()), allocator);
 
@@ -164,6 +167,12 @@ void VisualisationEvent::fromJson(std::string json)
     rapidjson::Value& fileVersion = tree["fileVersion"];
     version = fileVersion.GetInt();
   }
+  auto timeStamp = time(nullptr);
+  if (tree.HasMember("timeStamp")) {
+    rapidjson::Value& fileTimeStamp = tree["timeStamp"];
+    timeStamp = fileTimeStamp.GetFloat();
+  }
+  this->mTimeStamp = timeStamp;
 
   rapidjson::Value& trackCount = tree["trackCount"];
   this->mTracks.reserve(trackCount.GetInt());
@@ -213,5 +222,10 @@ bool VisualisationEvent::fromFile(std::string fileName)
   return true;
 }
 
+VisualisationEvent::VisualisationEvent()
+{
+  this->mTimeStamp = time(nullptr); // current time
+}
+
 } // namespace event_visualisation
 } // namespace o2

EventVisualisation/Workflow/include/EveWorkflow/EveWorkflowHelper.h

@@ -17,11 +17,14 @@
 #define ALICE_O2_EVENTVISUALISATION_WORKFLOW_EVEWORKFLOWHELPER_H
 
 #include "ReconstructionDataFormats/GlobalTrackID.h"
+#include "DataFormatsTRD/TrackTRD.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
 #include "EveWorkflow/EveConfiguration.h"
 #include "EventVisualisationDataConverter/VisualisationEvent.h"
 #include "MFTBase/GeometryTGeo.h"
 #include "ITSBase/GeometryTGeo.h"
+#include "TPCFastTransform.h"
+#include "TPCReconstruction/TPCFastTransformHelperO2.h"
 
 namespace o2::itsmft
 {
@@ -43,7 +46,7 @@ class EveWorkflowHelper
   static constexpr std::array<std::pair<float, float>, GID::NSources> minmaxR{{
     {1., 40.},   // ITS
     {85., 240.}, // TPC
-    {-1, -1},    // TRD
+    {-1, -1},    // TRD (never alone)
     {-1, -1},    // TOF
     {-1, -1},    // PHS
     {-1, -1},    // CPV
@@ -60,33 +63,40 @@ class EveWorkflowHelper
     {85., 430.}, // TPCTOF
     {85., 380.}, // TPCTRD
     {1., 380.},  // ITSTPCTRD
-    {-1, -1},    // ITSTPCTOF,
-    {-1, -1},    // TPCTRDTOF,
-    {-1, -1},    // ITSTPCTRDTOF, // full barrel track
+    {1., 430.},  // ITSTPCTOF,
+    {85., 430.}, // TPCTRDTOF,
+    {1., 430.},  // ITSTPCTRDTOF, // full barrel track
     {-1, -1},    // ITSAB,
   }};
+  std::unique_ptr<gpu::TPCFastTransform> mTPCFastTransform;
 
  public:
   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);
-  template <typename Functor>
-  void addTrackToEvent(Functor source, GID gid, float trackTime, float z = 0.); // store track in mEvent
-  void draw(std::string jsonPath, int numberOfFiles, int numberOfTracks = -1);
+  void addTrackToEvent(const o2::track::TrackParCov& tr, GID gid, float trackTime, float dz);
+  void draw(std::string jsonPath, int numberOfFiles, int numberOfTracks, o2::dataformats::GlobalTrackID::mask_t trkMask, o2::dataformats::GlobalTrackID::mask_t clMask, float mWorkflowVersion);
   void drawTPC(GID gid, float trackTime);
   void drawITS(GID gid, float trackTime);
   void drawMFT(GID gid, float trackTime);
   void drawMCH(GID gid, float trackTime);
+  void drawMID(GID gid, float trackTime);
   void drawITSTPC(GID gid, float trackTime);
   void drawITSTPCTOF(GID gid, float trackTime);
+  void drawITSTPCTRD(GID gid, float trackTime);
+  void drawITSTPCTRDTOF(GID gid, float trackTime);
+  void drawTPCTRDTOF(GID gid, float trackTime);
+  void drawTPCTRD(GID gid, float trackTime);
+  void drawTPCTOF(GID gid, float trackTime);
   void drawITSClusters(GID gid, float trackTime);
   void drawTPCClusters(GID gid, float trackTime);
   void drawMFTClusters(GID gid, float trackTime);
   void drawMCHClusters(GID gid, float trackTime);
+  void drawMIDClusters(GID gid, float trackTime);
+  void drawTRDClusters(const o2::trd::TrackTRD& trc, float trackTime);
+  void drawTOFClusters(GID gid, float trackTime);
   void drawPoint(float x, float y, float z, float time) { mEvent.addCluster(x, y, z, time); }
-  void drawPoint(o2::BaseCluster<float> pnt, float time) { mEvent.addCluster(pnt.getX(), pnt.getY(), pnt.getZ(), time); }
-  void drawPoint(const float xyz[], float time) { mEvent.addCluster(xyz[0], xyz[1], xyz[2], time); }
   void prepareITSClusters(const o2::itsmft::TopologyDictionary& dict); // fills mITSClustersArray
   void prepareMFTClusters(const o2::itsmft::TopologyDictionary& dict); // fills mMFTClustersArray
 

EventVisualisation/Workflow/include/EveWorkflow/O2DPLDisplay.h

@@ -46,6 +46,7 @@ class TPCFastTransform;
 class O2DPLDisplaySpec : public o2::framework::Task
 {
  public:
+  static constexpr float mWorkflowVersion = 1.01; // helps recognizing version of workflow which produce data
   O2DPLDisplaySpec(bool useMC, o2::dataformats::GlobalTrackID::mask_t trkMask,
                    o2::dataformats::GlobalTrackID::mask_t clMask,
                    std::shared_ptr<o2::globaltracking::DataRequest> dataRequest, std::string jsonPath,