Minor modifications such that ITS geometry does not break GPU Standalone compilation when headers are included

davidrohr · davidrohr · commit ce3c49da76e3 · 2021-05-06T17:30:25.000+02:00
diff --git a/Detectors/Base/include/DetectorsBase/GeometryManager.h b/Detectors/Base/include/DetectorsBase/GeometryManager.h
@@ -22,7 +22,7 @@
 #include <TObject.h> // for TObject
 #include <string_view>
 #include "DetectorsCommonDataFormats/DetID.h"
-#include "FairLogger.h" // for LOG
+#include "GPUCommonLogger.h" // for LOG
 #include "MathUtils/Cartesian.h"
 #include "DetectorsBase/MatCell.h"
 #include <mutex>
diff --git a/Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h b/Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h
@@ -53,10 +53,14 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
   static GeometryTGeo* Instance()
   {
     // get (create if needed) a unique instance of the object
+#ifdef GPUCA_STANDALONE
+    return nullptr; // TODO: DR: Obviously wrong, but to make it compile for now
+#else
     if (!sInstance) {
       sInstance = std::unique_ptr<GeometryTGeo>(new GeometryTGeo(true, 0));
     }
     return sInstance.get();
+#endif
   }
 
   // adopt the unique instance from external raw pointer (to be used only to read saved instance from file)
@@ -74,7 +78,7 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
   );
 
   /// Default destructor
-  ~GeometryTGeo() override = default;
+  ~GeometryTGeo() override;
 
   GeometryTGeo(const GeometryTGeo& src) = delete;
   GeometryTGeo& operator=(const GeometryTGeo& geom) = delete;
@@ -345,7 +349,9 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
   static std::string sWrapperVolumeName; ///< Wrapper volume name
 
  private:
+#ifndef GPUCA_STANDALONE
   static std::unique_ptr<o2::its::GeometryTGeo> sInstance; ///< singletone instance
+#endif
 
   ClassDefOverride(GeometryTGeo, 1); // ITS geometry based on TGeo
 };
diff --git a/Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx b/Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx
@@ -49,6 +49,7 @@ using Segmentation = o2::itsmft::SegmentationAlpide;
 ClassImp(o2::its::GeometryTGeo);
 
 std::unique_ptr<o2::its::GeometryTGeo> GeometryTGeo::sInstance;
+o2::its::GeometryTGeo::~GeometryTGeo() = default;
 
 std::string GeometryTGeo::sVolumeName = "ITSV";               ///< Mother volume name
 std::string GeometryTGeo::sLayerName = "ITSULayer";           ///< Layer name
