GPU Display: fetch ITS topology dictionary from CCDB

davidrohr · davidrohr · commit ee7c5dc9642e · 2022-05-28T14:20:50.000+02:00
diff --git a/GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.cxx b/GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.cxx
@@ -71,3 +71,8 @@ int GPUO2InterfaceDisplay::endDisplay()
   mFrontend->DisplayExit();
   return 0;
 }
+
+void GPUO2InterfaceDisplay::UpdateCalib(const GPUCalibObjectsConst* calib)
+{
+  mDisplay->UpdateCalib(calib);
+}
diff --git a/GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.h b/GPU/GPUTracking/Interface/GPUO2InterfaceDisplay.h
@@ -28,6 +28,7 @@
 
 #include <memory>
 #include <vector>
+#include "GPUDataTypes.h"
 
 namespace o2::gpu
 {
@@ -43,6 +44,7 @@ class GPUO2InterfaceDisplay
   GPUO2InterfaceDisplay(const GPUO2InterfaceConfiguration* config = nullptr);
   ~GPUO2InterfaceDisplay();
 
+  void UpdateCalib(const GPUCalibObjectsConst* calib);
   int startDisplay();
   int show(const GPUTrackingInOutPointers* ptrs);
   int endDisplay();
diff --git a/GPU/GPUTracking/display/GPUDisplay.h b/GPU/GPUTracking/display/GPUDisplay.h
@@ -48,6 +48,7 @@ class GPUDisplay : public GPUDisplayInterface
   void ShowNextEvent(const GPUTrackingInOutPointers* ptrs = nullptr) override;
   void WaitForNextEvent() override;
   void SetCollisionFirstCluster(unsigned int collision, int slice, int cluster) override;
+  void UpdateCalib(const GPUCalibObjectsConst* calib) override { mCalib = calib; }
 
   void HandleKey(unsigned char key);
   int DrawGLScene();
diff --git a/GPU/GPUTracking/display/GPUDisplayInterface.h b/GPU/GPUTracking/display/GPUDisplayInterface.h
@@ -34,6 +34,7 @@ class GPUDisplayInterface
   virtual void ShowNextEvent(const GPUTrackingInOutPointers* ptrs = nullptr) = 0;
   virtual void WaitForNextEvent() = 0;
   virtual void SetCollisionFirstCluster(unsigned int collision, int slice, int cluster) = 0;
+  virtual void UpdateCalib(const GPUCalibObjectsConst* calib) = 0;
   static GPUDisplayInterface* getDisplay(GPUDisplayFrontendInterface* frontend, GPUChainTracking* chain, GPUQA* qa, const GPUParam* param = nullptr, const GPUCalibObjectsConst* calib = nullptr, const GPUSettingsDisplay* config = nullptr);
 
  protected:
diff --git a/GPU/Workflow/include/GPUWorkflow/O2GPUDPLDisplay.h b/GPU/Workflow/include/GPUWorkflow/O2GPUDPLDisplay.h
@@ -43,9 +43,11 @@ class O2GPUDPLDisplaySpec : public o2::framework::Task
   void init(o2::framework::InitContext& ic) final;
   void run(o2::framework::ProcessingContext& pc) final;
   void endOfStream(o2::framework::EndOfStreamContext& ec) final;
+  void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj) final;
 
  private:
   bool mUseMC = false;
+  bool mUpdateCalib = false;
   o2::dataformats::GlobalTrackID::mask_t mTrkMask;
   o2::dataformats::GlobalTrackID::mask_t mClMask;
   std::unique_ptr<GPUO2InterfaceDisplay> mDisplay;
diff --git a/GPU/Workflow/src/O2GPUDPLDisplay.cxx b/GPU/Workflow/src/O2GPUDPLDisplay.cxx
@@ -87,6 +87,9 @@ void O2GPUDPLDisplaySpec::init(InitContext& ic)
 void O2GPUDPLDisplaySpec::run(ProcessingContext& pc)
 {
   static bool first = false;
+  if (mUpdateCalib) {
+    mDisplay->UpdateCalib(&mConfig->configCalib);
+  }
   if (first == false) {
     if (mDisplay->startDisplay()) {
       throw std::runtime_error("Error starting event display");
@@ -106,6 +109,15 @@ void O2GPUDPLDisplaySpec::endOfStream(EndOfStreamContext& ec)
   mDisplay->endDisplay();
 }
 
+void O2GPUDPLDisplaySpec::finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj)
+{
+  if (matcher == o2::framework::ConcreteDataMatcher("ITS", "CLUSDICT", 0)) {
+    mConfig->configCalib.itsPatternDict = (const o2::itsmft::TopologyDictionary*)obj;
+    mUpdateCalib = true;
+    return;
+  }
+}
+
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   WorkflowSpec specs;

Original file line number	Diff line number	Diff line change
`@@ -71,3 +71,8 @@ int GPUO2InterfaceDisplay::endDisplay()`
`71`	`71`	`mFrontend->DisplayExit();`
`72`	`72`	`return 0;`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+void GPUO2InterfaceDisplay::UpdateCalib(const GPUCalibObjectsConst* calib)`
	`76`	`+{`
	`77`	`+ mDisplay->UpdateCalib(calib);`
	`78`	`+}`