ITS: add back datastreams

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx

@@ -164,6 +164,7 @@ void ITSTrackingInterface::run(framework::ProcessingContext& pc)
   auto& allTracks = pc.outputs().make<std::vector<o2::its::TrackITS>>(Output{"ITS", "TRACKS", 0});
   auto& allTrackROFs = pc.outputs().make<std::vector<o2::itsmft::ROFRecord>>(Output{"ITS", "ITSTrackROF", 0});
   auto& vertices = pc.outputs().make<std::vector<Vertex>>(Output{"ITS", "VERTICES", 0});
+  auto& vertROFvec = pc.outputs().make<std::vector<o2::itsmft::ROFRecord>>(Output{"ITS", "VERTICESROF", 0}); // TODO fill this!
 
   // MC
   static pmr::vector<o2::MCCompLabel> dummyMCLabTracks, dummyMCLabVerts;

Detectors/ITSMFT/ITS/workflow/include/ITSWorkflow/TrackReaderSpec.h

@@ -43,6 +43,7 @@ class TrackReader final : public o2::framework::Task
   std::vector<o2::itsmft::ROFRecord> mROFRec, *mROFRecInp = &mROFRec;
   std::vector<o2::its::TrackITS> mTracks, *mTracksInp = &mTracks;
   std::vector<Vertex> mVertices, *mVerticesInp = &mVertices;
+  std::vector<o2::itsmft::ROFRecord> mVerticesROFRec, *mVerticesROFRecInp = &mVerticesROFRec;
   std::vector<int> mClusInd, *mClusIndInp = &mClusInd;
   std::vector<o2::MCCompLabel> mMCTruth, *mMCTruthInp = &mMCTruth;
   std::vector<o2::MCCompLabel> mMCVertTruth, *mMCVTruthInp = &mMCTruth;
@@ -59,6 +60,7 @@ class TrackReader final : public o2::framework::Task
   std::string mTrackBranchName = "ITSTrack";
   std::string mClusIdxBranchName = "ITSTrackClusIdx";
   std::string mVertexBranchName = "Vertices";
+  std::string mVertexROFBranchName = "VerticesROF";
   std::string mTrackMCTruthBranchName = "ITSTrackMCTruth";
   std::string mTrackMCVertTruthBranchName = "ITSVertexMCTruth";
 };

Detectors/ITSMFT/ITS/workflow/src/TrackReaderSpec.cxx

@@ -41,6 +41,7 @@ void TrackReader::run(ProcessingContext& pc)
   pc.outputs().snapshot(Output{mOrigin, "TRACKS", 0}, mTracks);
   pc.outputs().snapshot(Output{mOrigin, "TRACKCLSID", 0}, mClusInd);
   pc.outputs().snapshot(Output{"ITS", "VERTICES", 0}, mVertices);
+  pc.outputs().snapshot(Output{"ITS", "VERTICESROF", 0}, mVerticesROFRec);
   if (mUseMC) {
     pc.outputs().snapshot(Output{mOrigin, "TRACKSMCTR", 0}, mMCTruth);
     pc.outputs().snapshot(Output{mOrigin, "VERTICESMCTR", 0}, mMCVertTruth);
@@ -86,6 +87,7 @@ DataProcessorSpec getITSTrackReaderSpec(bool useMC)
   outputSpec.emplace_back("ITS", "TRACKS", 0, Lifetime::Timeframe);
   outputSpec.emplace_back("ITS", "TRACKCLSID", 0, Lifetime::Timeframe);
   outputSpec.emplace_back("ITS", "VERTICES", 0, Lifetime::Timeframe);
+  outputSpec.emplace_back("ITS", "VERTICESROF", 0, Lifetime::Timeframe);
   if (useMC) {
     outputSpec.emplace_back("ITS", "TRACKSMCTR", 0, Lifetime::Timeframe);
     outputSpec.emplace_back("ITS", "VERTICESMCTR", 0, Lifetime::Timeframe);

Detectors/ITSMFT/ITS/workflow/src/TrackWriterSpec.cxx

@@ -58,6 +58,8 @@ DataProcessorSpec getTrackWriterSpec(bool useMC)
                                 BranchDefinition<std::vector<o2::itsmft::ROFRecord>>{InputSpec{"ROframes", "ITS", "ITSTrackROF", 0},
                                                                                      "ITSTracksROF",
                                                                                      logger},
+                                BranchDefinition<std::vector<o2::itsmft::ROFRecord>>{InputSpec{"vtxROF", "ITS", "VERTICESROF", 0},
+                                                                                     "VerticesROF"},
                                 BranchDefinition<LabelsType>{InputSpec{"labels", "ITS", "TRACKSMCTR", 0},
                                                              "ITSTrackMCTruth",
                                                              (useMC ? 1 : 0), // one branch if mc labels enabled

Detectors/ITSMFT/ITS/workflow/src/TrackerSpec.cxx

@@ -128,6 +128,7 @@ DataProcessorSpec getTrackerSpec(bool useMC, bool doStag, bool useGeom, int trgT
   outputs.emplace_back("ITS", "TRACKCLSID", 0, Lifetime::Timeframe);
   outputs.emplace_back("ITS", "ITSTrackROF", 0, Lifetime::Timeframe);
   outputs.emplace_back("ITS", "VERTICES", 0, Lifetime::Timeframe);
+  outputs.emplace_back("ITS", "VERTICESROF", 0, Lifetime::Timeframe);
   outputs.emplace_back("ITS", "IRFRAMES", 0, Lifetime::Timeframe);
   if (useMC) {
     outputs.emplace_back("ITS", "VERTICESMCTR", 0, Lifetime::Timeframe);

GPU/GPUTracking/DataTypes/GPUDataTypesIO.h

@@ -251,6 +251,8 @@ struct GPUTrackingInOutPointers {
   const o2::MCCompLabel* itsTrackMC = nullptr;
   uint32_t nItsTracks = 0;
   const int32_t* itsTrackClusIdx = nullptr;
+  const o2::itsmft::ROFRecord* itsTrackROF = nullptr;
+  uint32_t nItsTrackROF = 0;
 
   // TPC-ITS
   const o2::dataformats::TrackTPCITS* tracksTPCITSO2 = nullptr;

GPU/Workflow/helper/src/GPUWorkflowHelper.cxx

@@ -55,11 +55,14 @@ std::shared_ptr<const GPUWorkflowHelper::tmpDataContainer> GPUWorkflowHelper::fi
   }
   if (maskTrk[GID::ITS] && ioPtr.nItsTracks == 0) {
     const auto& ITSTracksArray = recoCont.getITSTracks();
-    if (!ITSTracksArray.empty()) {
+    const auto& ITSTrackROFRec = recoCont.getITSTracksROFRecords();
+    if (ITSTracksArray.size() && ITSTrackROFRec.size()) {
       const auto& ITSTrackClusIdx = recoCont.getITSTracksClusterRefs();
       ioPtr.nItsTracks = ITSTracksArray.size();
       ioPtr.itsTracks = ITSTracksArray.data();
       ioPtr.itsTrackClusIdx = ITSTrackClusIdx.data();
+      ioPtr.nItsTrackROF = ITSTrackROFRec.size();
+      ioPtr.itsTrackROF = ITSTrackROFRec.data();
       if (useMC) {
         const auto& ITSTrkLabels = recoCont.getITSTracksMCLabels();
         ioPtr.itsTrackMC = ITSTrkLabels.data();

GPU/Workflow/src/GPUWorkflowSpec.cxx

@@ -1229,7 +1229,7 @@ Inputs GPURecoWorkflowSpec::inputs()
   }
 
   if (mSpecConfig.runITSTracking) {
-    for (unsigned int iLay{0}; iLay < 7; ++iLay) {
+    for (unsigned int iLay{0}; iLay < (mSpecConfig.itsStaggered ? 7 : 0); ++iLay) {
       inputs.emplace_back("compClusters", "ITS", "COMPCLUSTERS", iLay, Lifetime::Timeframe);
       inputs.emplace_back("patterns", "ITS", "PATTERNS", iLay, Lifetime::Timeframe);
       inputs.emplace_back("ROframes", "ITS", "CLUSTERSROF", iLay, Lifetime::Timeframe);
@@ -1380,7 +1380,9 @@ Outputs GPURecoWorkflowSpec::outputs()
   if (mSpecConfig.runITSTracking) {
     outputSpecs.emplace_back(gDataOriginITS, "TRACKS", 0, Lifetime::Timeframe);
     outputSpecs.emplace_back(gDataOriginITS, "TRACKCLSID", 0, Lifetime::Timeframe);
+    outputSpecs.emplace_back(gDataOriginITS, "ITSTrackROF", 0, Lifetime::Timeframe);
     outputSpecs.emplace_back(gDataOriginITS, "VERTICES", 0, Lifetime::Timeframe);
+    outputSpecs.emplace_back(gDataOriginITS, "VERTICESROF", 0, Lifetime::Timeframe);
     outputSpecs.emplace_back(gDataOriginITS, "IRFRAMES", 0, Lifetime::Timeframe);
 
     if (mSpecConfig.processMC) {