AliceO2Group · davidrohr · Nov 13, 2020 · Nov 11, 2020 · Nov 11, 2020 · Nov 11, 2020
@@ -163,7 +163,7 @@ DataProcessorSpec getCATrackerSpec(CompletionPolicyData* policyData, ca::Config
      config.configProcessing.runMC = specconfig.processMC;
      if (specconfig.outputQA) {
        if (!config.configProcessing.runQA) {
-          config.configQA.forQC = true;
+          config.configQA.shipToQC = true;
        }
        config.configProcessing.runQA = true;
      }
@@ -713,6 +713,7 @@ DataProcessorSpec getCATrackerSpec(CompletionPolicyData* policyData, ca::Config
        std::vector<TH1D> copy3 = *outputRegions.qa.hist3;
        processAttributes->qa->postprocess(copy1, copy2, copy3, out);
        pc.outputs().snapshot({gDataOriginTPC, "TRACKINGQA", 0, Lifetime::Timeframe}, out);
+        processAttributes->qa->cleanup();
      }
      timer.Stop();
      LOG(INFO) << "TPC CATracker time for this TF " << timer.CpuTime() - cput << " s";

@@ -160,7 +160,8 @@ AddOptionVec(matchMCLabels, const char*, "", 0, "Read labels from files and matc
 AddOption(matchDisplayMinPt, float, 0, "", 0, "Minimum Pt of a matched track to be displayed")
 AddOption(writeRootFiles, bool, false, "", 0, "Create ROOT canvas files")
 AddOption(noMC, bool, false, "", 0, "Force running QA without MC labels even if present")
-AddOption(forQC, bool, false, "", 0, "Do not write output files but ship histograms for QC")
+AddOption(shipToQC, bool, false, "", 0, "Do not write output files but ship histograms for QC")
+AddOption(shipToQCAsCanvas, bool, false, "", 0, "Send TCanvases with full layout to QC instead of individual histograms")
 AddShortcut("compare", 0, "--QAinput", "Compare QA histograms", "--qa", "--QAinputHistogramsOnly")
 AddHelp("help", 'h')
 EndConfig()

@@ -42,7 +42,6 @@ class GPUTPCCompressionKernels : public GPUKernelTemplate
  template <int iKernel = defaultKernel>
  GPUd() static void Thread(int nBlocks, int nThreads, int iBlock, int iThread, GPUsharedref() GPUSharedMemory& GPUrestrict() smem, processorType& GPUrestrict() processors);

- public:
  template <int I>
  class GPUTPCCompressionKernels_Compare
  {

@@ -421,7 +421,7 @@ int GPUChainTracking::ForceInitQA()

 int GPUChainTracking::Finalize()
 {
-  if (GetProcessingSettings().runQA && mQA->IsInitialized()) {
+  if (GetProcessingSettings().runQA && mQA->IsInitialized() && !(mConfigQA && mConfigQA->shipToQC)) {
    mQA->DrawQAHistograms();
  }
  if (GetProcessingSettings().debugLevel >= 6) {

@@ -171,8 +171,8 @@ class GPUChainTracking : public GPUChain, GPUReconstructionHelpers::helperDelega
  void SetOutputControlTPCTracks(GPUOutputControl* v) { mOutputTPCTracks = v; }
  void SetOutputControlClusterLabels(GPUOutputControl* v) { mOutputClusterLabels = v; }

-  const void* mConfigDisplay = nullptr; // Abstract pointer to Standalone Display Configuration Structure
-  const void* mConfigQA = nullptr;      // Abstract pointer to Standalone QA Configuration Structure
+  const GPUSettingsDisplay* mConfigDisplay = nullptr; // Abstract pointer to Standalone Display Configuration Structure
+  const GPUSettingsQA* mConfigQA = nullptr;           // Abstract pointer to Standalone QA Configuration Structure

 protected:
  struct GPUTrackingFlatObjects : public GPUProcessor {

@@ -160,7 +160,7 @@ int GPUTPCO2Interface::RunTracking(GPUTrackingInOutPointers* data, GPUInterfaceO
    outputs->clustersNative.size = mOutputClustersNative->EndOfSpace ? 0 : (mChain->mIOPtrs.clustersNative->nClustersTotal * sizeof(*mChain->mIOPtrs.clustersNative->clustersLinear));
    outputs->tpcTracks.size = mOutputCompressedClusters->EndOfSpace ? 0 : (size_t)((char*)mOutputCompressedClusters->OutputPtr - (char*)mOutputCompressedClusters->OutputBase);
  }
-  if (mConfig->configQA.forQC) {
+  if (mConfig->configQA.shipToQC) {
    outputs->qa.hist1 = &mChain->GetQA()->getHistograms1D();
    outputs->qa.hist2 = &mChain->GetQA()->getHistograms2D();
    outputs->qa.hist3 = &mChain->GetQA()->getHistograms1Dd();

@@ -30,3 +30,8 @@ int GPUO2InterfaceQA::postprocess(std::vector<TH1F>& in1, std::vector<TH2F>& in2
  }
  return mQA->DrawQAHistograms(&out);
 }
+
+void GPUO2InterfaceQA::cleanup()
+{
+  mQA->DrawQAHistogramsCleanup();
+}
@@ -45,6 +45,7 @@ class GPUO2InterfaceQA

  // Input might be modified, so we assume non-const. If it is const, a copy should be created before.
  int postprocess(std::vector<TH1F>& in1, std::vector<TH2F>& in2, std::vector<TH1D>& in3, TObjArray& out);
+  void cleanup();

 private:
  std::unique_ptr<GPUQA> mQA;

@@ -89,7 +89,7 @@ static const GPUSettingsDisplay& GPUDisplay_GetConfig(GPUChainTracking* chain)
 #if !defined(GPUCA_STANDALONE)
  static GPUSettingsDisplay defaultConfig;
  if (chain->mConfigDisplay) {
-    return *((const GPUSettingsDisplay*)chain->mConfigDisplay);
+    return *chain->mConfigDisplay;
  } else {
    return defaultConfig;
  }