GPU: Add ITS3 to workflow

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

Author: f3sch

GPU/Workflow/CMakeLists.txt

@@ -27,7 +27,8 @@ o2_add_library(GPUWorkflow
                                      O2::DataFormatsGlobalTracking
                                      O2::DataFormatsTRD
                PRIVATE_LINK_LIBRARIES O2::GPUTracking
-                                      O2::ITSTrackingInterface)
+                                      O2::ITSTrackingInterface
+                                      $<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3TrackingInterface>)
 
 o2_add_executable(reco-workflow
        COMPONENT_NAME gpu

GPU/Workflow/include/GPUWorkflow/GPUWorkflowSpec.h

@@ -128,6 +128,7 @@ class GPURecoWorkflowSpec : public o2::framework::Task
     int32_t lumiScaleType = 0; // 0=off, 1=CTP, 2=TPC scalers
     bool outputErrorQA = false;
     bool runITSTracking = false;
+    bool runITS3Tracking = false;
     bool processITSMC = false;
     bool itsOverrBeamEst = false;
     bool tpcTriggerHandling = false;

GPU/Workflow/src/GPUWorkflowITS.cxx

@@ -20,6 +20,10 @@
 
 #include "ITStracking/TrackingInterface.h"
 
+#ifdef ENABLE_UPGRADES
+#include "ITS3Reconstruction/TrackingInterface.h"
+#endif
+
 namespace o2::gpu
 {
 
@@ -35,9 +39,21 @@ void GPURecoWorkflowSpec::initFunctionITS(o2::framework::InitContext& ic)
 {
   o2::its::VertexerTraits* vtxTraits = nullptr;
   o2::its::TrackerTraits* trkTraits = nullptr;
-  mITSTrackingInterface = std::make_unique<o2::its::ITSTrackingInterface>(mSpecConfig.processMC,
+#ifdef ENABLE_UPGRADES
+  if (mSpecConfig.runITS3Tracking) {
+    mITSTrackingInterface = std::make_unique<o2::its3::ITS3TrackingInterface>(mSpecConfig.processITSMC,
+                                                                              mSpecConfig.itsTriggerType,
+                                                                              mSpecConfig.itsOverrBeamEst);
+  } else {
+    mITSTrackingInterface = std::make_unique<o2::its::ITSTrackingInterface>(mSpecConfig.processITSMC,
+                                                                            mSpecConfig.itsTriggerType,
+                                                                            mSpecConfig.itsOverrBeamEst);
+  }
+#else
+  mITSTrackingInterface = std::make_unique<o2::its::ITSTrackingInterface>(mSpecConfig.processITSMC,
                                                                           mSpecConfig.itsTriggerType,
                                                                           mSpecConfig.itsOverrBeamEst);
+#endif
   mGPUReco->GetITSTraits(trkTraits, vtxTraits, mITSTimeFrame);
   mITSTrackingInterface->setTraitsFromProvider(vtxTraits, trkTraits, mITSTimeFrame);
 }

GPU/Workflow/src/GPUWorkflowSpec.cxx

@@ -223,7 +223,7 @@ void GPURecoWorkflowSpec::init(InitContext& ic)
     mConfig->configWorkflow.inputs.setBits(GPUDataTypes::InOutType::TRDTracklets, true);
     mConfig->configWorkflow.steps.setBits(GPUDataTypes::RecoStep::TRDTracking, true);
   }
-  if (mSpecConfig.runITSTracking) {
+  if (mSpecConfig.runITSTracking | mSpecConfig.runITS3Tracking) {
     mConfig->configWorkflow.inputs.setBits(GPUDataTypes::InOutType::ITSClusters, true);
     mConfig->configWorkflow.outputs.setBits(GPUDataTypes::InOutType::ITSTracks, true);
     mConfig->configWorkflow.steps.setBits(GPUDataTypes::RecoStep::ITSTracking, true);
@@ -299,7 +299,7 @@ void GPURecoWorkflowSpec::init(InitContext& ic)
     }
 
     // initialize ITS
-    if (mSpecConfig.runITSTracking) {
+    if (mSpecConfig.runITSTracking || mSpecConfig.runITS3Tracking) {
       initFunctionITS(ic);
     }
   }
@@ -376,7 +376,7 @@ void GPURecoWorkflowSpec::finaliseCCDB(o2::framework::ConcreteDataMatcher& match
 {
   if (mSpecConfig.enableDoublePipeline != 2) {
     finaliseCCDBTPC(matcher, obj);
-    if (mSpecConfig.runITSTracking) {
+    if (mSpecConfig.runITSTracking || mSpecConfig.runITS3Tracking) {
       finaliseCCDBITS(matcher, obj);
     }
   }
@@ -509,7 +509,7 @@ int32_t GPURecoWorkflowSpec::runMain(o2::framework::ProcessingContext* pc, GPUTr
   if (mConfParam->dump < 2) {
     retVal = mGPUReco->RunTracking(ptrs, outputRegions, threadIndex, inputUpdateCallback);
 
-    if (retVal == 0 && mSpecConfig.runITSTracking) {
+    if (retVal == 0 && (mSpecConfig.runITSTracking || mSpecConfig.runITS3Tracking)) {
       retVal = runITSTracking(*pc);
     }
   }
@@ -1046,7 +1046,7 @@ void GPURecoWorkflowSpec::doCalibUpdates(o2::framework::ProcessingContext& pc, c
     }
   }
   needCalibUpdate = fetchCalibsCCDBTPC(pc, newCalibObjects, oldCalibObjects) || needCalibUpdate;
-  if (mSpecConfig.runITSTracking) {
+  if (mSpecConfig.runITSTracking || mSpecConfig.runITS3Tracking) {
     needCalibUpdate = fetchCalibsCCDBITS(pc) || needCalibUpdate;
   }
   if (mTPCCutAtTimeBin != mConfig->configGRP.tpcCutTimeBin) {
@@ -1165,7 +1165,7 @@ Inputs GPURecoWorkflowSpec::inputs()
     inputs.emplace_back("trdtrigrecmask", o2::header::gDataOriginTRD, "TRIGRECMASK", 0, Lifetime::Timeframe);
   }
 
-  if (mSpecConfig.runITSTracking) {
+  if (mSpecConfig.runITSTracking || mSpecConfig.runITS3Tracking) {
     inputs.emplace_back("compClusters", "ITS", "COMPCLUSTERS", 0, Lifetime::Timeframe);
     inputs.emplace_back("patterns", "ITS", "PATTERNS", 0, Lifetime::Timeframe);
     inputs.emplace_back("ROframes", "ITS", "CLUSTERSROF", 0, Lifetime::Timeframe);
@@ -1174,9 +1174,13 @@ Inputs GPURecoWorkflowSpec::inputs()
     } else if (mSpecConfig.itsTriggerType == 2) {
       inputs.emplace_back("phystrig", "TRD", "TRKTRGRD", 0, Lifetime::Timeframe);
     }
-    inputs.emplace_back("itscldict", "ITS", "CLUSDICT", 0, Lifetime::Condition, ccdbParamSpec("ITS/Calib/ClusterDictionary"));
-    inputs.emplace_back("itsalppar", "ITS", "ALPIDEPARAM", 0, Lifetime::Condition, ccdbParamSpec("ITS/Config/AlpideParam"));
-
+    if (mSpecConfig.runITS3Tracking) {
+      inputs.emplace_back("cldict", "IT3", "CLUSDICT", 0, Lifetime::Condition, ccdbParamSpec("IT3/Calib/ClusterDictionary"));
+      inputs.emplace_back("alppar", "ITS", "ALPIDEPARAM", 0, Lifetime::Condition, ccdbParamSpec("ITS/Config/AlpideParam"));
+    } else {
+      inputs.emplace_back("itscldict", "ITS", "CLUSDICT", 0, Lifetime::Condition, ccdbParamSpec("ITS/Calib/ClusterDictionary"));
+      inputs.emplace_back("itsalppar", "ITS", "ALPIDEPARAM", 0, Lifetime::Condition, ccdbParamSpec("ITS/Config/AlpideParam"));
+    }
     if (mSpecConfig.itsOverrBeamEst) {
       inputs.emplace_back("meanvtx", "GLO", "MEANVERTEX", 0, Lifetime::Condition, ccdbParamSpec("GLO/Calib/MeanVertex", {}, 1));
     }
@@ -1246,7 +1250,7 @@ Outputs GPURecoWorkflowSpec::outputs()
     outputSpecs.emplace_back(gDataOriginGPU, "ERRORQA", 0, Lifetime::Timeframe);
   }
 
-  if (mSpecConfig.runITSTracking) {
+  if (mSpecConfig.runITSTracking || mSpecConfig.runITS3Tracking) {
     outputSpecs.emplace_back(gDataOriginITS, "TRACKS", 0, Lifetime::Timeframe);
     outputSpecs.emplace_back(gDataOriginITS, "TRACKCLSID", 0, Lifetime::Timeframe);
     outputSpecs.emplace_back(gDataOriginITS, "ITSTrackROF", 0, Lifetime::Timeframe);