GPU Interface: provide setter for external occuapancy map

Author: davidrohr

GPU/GPUTracking/Interface/GPUO2InterfaceRefit.cxx

@@ -99,35 +99,26 @@ size_t GPUO2InterfaceRefit::fillOccupancyMapGetSize(unsigned int nHbfPerTf, cons
 GPUO2InterfaceRefit::GPUO2InterfaceRefit(const ClusterNativeAccess* cl, const CorrectionMapsHelper* trans, float bzNominalGPU, const TPCClRefElem* trackRef, unsigned int nHbfPerTf, const unsigned char* sharedmap, const unsigned int* occupancymap, int occupancyMapSize, const std::vector<TrackTPC>* trks, o2::base::Propagator* p)
 {
   mParam = GPUO2InterfaceUtils::getFullParam(bzNominalGPU, nHbfPerTf);
-  size_t expectedSharedMapSize = nHbfPerTf ? fillOccupancyMapGetSize(nHbfPerTf, mParam.get()) : 0;
+  size_t expectedOccMapSize = nHbfPerTf ? fillOccupancyMapGetSize(nHbfPerTf, mParam.get()) : 0;
   if (cl->nClustersTotal) {
     if (sharedmap == nullptr && trks == nullptr) {
       throw std::runtime_error("Must provide either shared cluster map or vector of tpc tracks to build the map");
     }
-    if ((sharedmap == nullptr) ^ (expectedSharedMapSize && occupancymap == nullptr)) {
+    if ((sharedmap == nullptr) ^ (expectedOccMapSize && occupancymap == nullptr)) {
       throw std::runtime_error("Must provide either both shared cluster map and occupancy map or none of them");
     }
     if (sharedmap == nullptr) {
       mSharedMap.resize(cl->nClustersTotal);
       sharedmap = mSharedMap.data();
-      mOccupancyMap.resize(expectedSharedMapSize / sizeof(*mOccupancyMap.data()));
+      mOccupancyMap.resize(expectedOccMapSize / sizeof(*mOccupancyMap.data()));
       occupancymap = mOccupancyMap.data();
+      occupancyMapSize = expectedOccMapSize;
       fillSharedClustersAndOccupancyMap(cl, *trks, trackRef, mSharedMap.data(), mOccupancyMap.data(), nHbfPerTf, mParam.get());
     }
   }
-  if (occupancymap && occupancyMapSize > sizeof(*occupancymap) && occupancymap[1] != (mParam->rec.tpc.occupancyMapTimeBins * 0x10000 + mParam->rec.tpc.occupancyMapTimeBinsAverage)) {
-    throw std::runtime_error("Occupancy map has invalid paramters occupancyMapTimeBins and occupancyMapTimeBinsAverage");
-  }
-  if (occupancyMapSize != -1 && nHbfPerTf && (size_t)occupancyMapSize != expectedSharedMapSize) {
-    throw std::runtime_error("Received occupancy map of wrong size, most likely --configKeyValues or HBperTF of map creator and map consumer are different");
-  }
+  GPUO2InterfaceUtils::paramUseExternalOccupancyMap(mParam.get(), nHbfPerTf, occupancymap, occupancyMapSize);
+
   mRefit = std::make_unique<GPUTrackingRefit>();
-  if (occupancymap) {
-    mParam->occupancyTotal = *occupancymap;
-    if (mParam->rec.tpc.occupancyMapTimeBins) {
-      mParam->occupancyMap = occupancymap + 2;
-    }
-  }
   mRefit->SetGPUParam(mParam.get());
   mRefit->SetClusterStateArray(sharedmap);
   mRefit->SetPropagator(p);

GPU/GPUTracking/Interface/GPUO2InterfaceUtils.cxx

@@ -14,6 +14,7 @@
 
 #include "GPUO2InterfaceUtils.h"
 #include "GPUO2InterfaceConfiguration.h"
+#include "GPUO2InterfaceRefit.h"
 #include "TPCPadGainCalib.h"
 #include "CalibdEdxContainer.h"
 #include "TPCBase/Sector.h"
@@ -115,3 +116,20 @@ std::shared_ptr<GPUParam> GPUO2InterfaceUtils::getFullParamShared(float solenoid
 {
   return std::move(getFullParam(solenoidBz, nHbfPerTf, pConfiguration, pO2Settings, autoMaxTimeBin));
 }
+
+void GPUO2InterfaceUtils::paramUseExternalOccupancyMap(GPUParam* param, unsigned int nHbfPerTf, const unsigned int* occupancymap, int occupancyMapSize)
+{
+  size_t expectedOccMapSize = nHbfPerTf ? GPUO2InterfaceRefit::fillOccupancyMapGetSize(nHbfPerTf, param) : 0;
+  if (occupancyMapSize != -1 && nHbfPerTf && (size_t)occupancyMapSize != expectedOccMapSize) {
+    throw std::runtime_error("Received occupancy map of wrong size, most likely --configKeyValues or HBperTF of map creator and map consumer are different");
+  }
+  if (occupancymap && occupancyMapSize > sizeof(*occupancymap) && occupancymap[1] != (param->rec.tpc.occupancyMapTimeBins * 0x10000 + param->rec.tpc.occupancyMapTimeBinsAverage)) {
+    throw std::runtime_error("Occupancy map has invalid paramters occupancyMapTimeBins and occupancyMapTimeBinsAverage");
+  }
+  if (occupancymap) {
+    param->occupancyTotal = *occupancymap;
+    if (param->rec.tpc.occupancyMapTimeBins) {
+      param->occupancyMap = occupancymap + 2;
+    }
+  }
+}

GPU/GPUTracking/Interface/GPUO2InterfaceUtils.h

@@ -57,6 +57,7 @@ class GPUO2InterfaceUtils
   }
   static std::unique_ptr<GPUParam> getFullParam(float solenoidBz, unsigned int nHbfPerTf = 0, std::unique_ptr<GPUO2InterfaceConfiguration>* pConfiguration = nullptr, std::unique_ptr<GPUSettingsO2>* pO2Settings = nullptr, bool* autoMaxTimeBin = nullptr);
   static std::shared_ptr<GPUParam> getFullParamShared(float solenoidBz, unsigned int nHbfPerTf = 0, std::unique_ptr<GPUO2InterfaceConfiguration>* pConfiguration = nullptr, std::unique_ptr<GPUSettingsO2>* pO2Settings = nullptr, bool* autoMaxTimeBin = nullptr); // Return owning pointer
+  static void paramUseExternalOccupancyMap(GPUParam* param, unsigned int nHbfPerTf, const unsigned int* occupancymap, int occupancyMapSize);
 
   class GPUReconstructionZSDecoder
   {