GPU: Some cleanup

Author: davidrohr

GPU/GPUTracking/Base/GPUMemoryResource.h

@@ -78,12 +78,10 @@ class GPUMemoryResource
                         ALLOCATION_INDIVIDUAL = 1,
                         ALLOCATION_GLOBAL = 2 };
 
-#ifndef GPUCA_GPUCODE
   GPUMemoryResource(GPUProcessor* proc, void* (GPUProcessor::*setPtr)(void*), MemoryType type, const char* name = "") : mProcessor(proc), mPtr(nullptr), mPtrDevice(nullptr), mSetPointers(setPtr), mName(name), mSize(0), mOverrideSize(0), mReuse(-1), mType(type)
   {
   }
   GPUMemoryResource(const GPUMemoryResource&) CON_DEFAULT;
-#endif
 
   void* SetPointers(void* ptr)
   {

GPU/GPUTracking/Base/GPUReconstruction.cxx

@@ -531,7 +531,7 @@ size_t GPUReconstruction::AllocateRegisteredMemoryHelper(GPUMemoryResource* res,
     return retVal;
   }
   if (memorypool == nullptr) {
-    GPUInfo("Memory pool uninitialized");
+    GPUError("Cannot allocate memory from uninitialized pool");
     throw std::bad_alloc();
   }
   size_t retVal;

GPU/Workflow/include/GPUWorkflow/GPUWorkflowSpec.h

@@ -84,6 +84,8 @@ class GPURecoWorkflowSpec : public o2::framework::Task
   using CompletionPolicyData = std::vector<framework::InputSpec>;
 
   struct Config {
+    int itsTriggerType = 0;
+    int lumiScaleMode = 0;
     bool decompressTPC = false;
     bool decompressTPCFromROOT = false;
     bool caClusterer = false;
@@ -104,9 +106,7 @@ class GPURecoWorkflowSpec : public o2::framework::Task
     bool requireCTPLumi = false;
     bool outputErrorQA = false;
     bool runITSTracking = false;
-    int itsTriggerType = 0;
     bool itsOverrBeamEst = false;
-    int lumiScaleMode = 0;
   };
 
   GPURecoWorkflowSpec(CompletionPolicyData* policyData, Config const& specconfig, std::vector<int> const& tpcsectors, unsigned long tpcSectorMask, std::shared_ptr<o2::base::GRPGeomRequest>& ggr);
@@ -134,7 +134,7 @@ class GPURecoWorkflowSpec : public o2::framework::Task
   bool fetchCalibsCCDBTPC(o2::framework::ProcessingContext& pc, T& newCalibObjects);
   bool fetchCalibsCCDBITS(o2::framework::ProcessingContext& pc);
   /// storing the new calib objects by overwritting the old calibs
-  void storeUpdatedCalibsTPCPtrs();
+  void cleanOldCalibsTPCPtrs();
 
   void doCalibUpdates(o2::framework::ProcessingContext& pc);
 

GPU/Workflow/src/GPUWorkflowSpec.cxx

@@ -720,7 +720,7 @@ void GPURecoWorkflowSpec::run(ProcessingContext& pc)
   o2::utils::DebugStreamer::instance()->flush();
 
   // setting TPC calibration objects
-  storeUpdatedCalibsTPCPtrs();
+  cleanOldCalibsTPCPtrs();
 
   mTracker->Clear(false);
 
@@ -1312,17 +1312,17 @@ Outputs GPURecoWorkflowSpec::outputs()
   }
 
   if (mSpecConfig.runITSTracking) {
-    outputSpecs.emplace_back("ITS", "TRACKS", 0, Lifetime::Timeframe);
-    outputSpecs.emplace_back("ITS", "TRACKCLSID", 0, Lifetime::Timeframe);
-    outputSpecs.emplace_back("ITS", "ITSTrackROF", 0, Lifetime::Timeframe);
-    outputSpecs.emplace_back("ITS", "VERTICES", 0, Lifetime::Timeframe);
-    outputSpecs.emplace_back("ITS", "VERTICESROF", 0, Lifetime::Timeframe);
-    outputSpecs.emplace_back("ITS", "IRFRAMES", 0, Lifetime::Timeframe);
+    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) {
-      outputSpecs.emplace_back("ITS", "VERTICESMCTR", 0, Lifetime::Timeframe);
-      outputSpecs.emplace_back("ITS", "TRACKSMCTR", 0, Lifetime::Timeframe);
-      outputSpecs.emplace_back("ITS", "ITSTrackMC2ROF", 0, Lifetime::Timeframe);
+      outputSpecs.emplace_back(gDataOriginITS, "VERTICESMCTR", 0, Lifetime::Timeframe);
+      outputSpecs.emplace_back(gDataOriginITS, "TRACKSMCTR", 0, Lifetime::Timeframe);
+      outputSpecs.emplace_back(gDataOriginITS, "ITSTrackMC2ROF", 0, Lifetime::Timeframe);
     }
   }
 
@@ -1681,16 +1681,14 @@ bool GPURecoWorkflowSpec::fetchCalibsCCDBTPC(ProcessingContext& pc, T& newCalibO
   return false;
 }
 
-void GPURecoWorkflowSpec::storeUpdatedCalibsTPCPtrs()
+void GPURecoWorkflowSpec::cleanOldCalibsTPCPtrs()
 {
   if (mdEdxCalibContainerBufferNew) {
     mdEdxCalibContainer = std::move(mdEdxCalibContainerBufferNew);
   }
-
   if (mTPCPadGainCalibBufferNew) {
     mTPCPadGainCalib = std::move(mTPCPadGainCalibBufferNew);
   }
-
   if (mFastTransformNew) {
     mFastTransform = std::move(mFastTransformNew);
   }