Move some headers/methods to src to avoid conflicts with GPU defines (#3150)

shahor02 · web-flow · commit b681e2bcd332 · 2020-03-13T16:26:57.000+01:00
Co-authored-by: shahoian &lt;ruben.shahoyan@cern.ch&gt;
diff --git a/Detectors/Base/include/DetectorsBase/Propagator.h b/Detectors/Base/include/DetectorsBase/Propagator.h
@@ -19,9 +19,7 @@
 #include "CommonConstants/PhysicsConstants.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackLTIntegral.h"
-#include "MathUtils/Cartesian3D.h"
 #include "DetectorsBase/MatLayerCylSet.h"
-#include "DetectorsBase/GeometryManager.h"
 
 namespace o2
 {
@@ -80,10 +78,7 @@ class Propagator
   Propagator();
   ~Propagator() = default;
 
-  MatBudget getMatBudget(int corrType, const Point3D<float>& p0, const Point3D<float>& p1) const
-  {
-    return (corrType == USEMatCorrTGeo) ? GeometryManager::meanMaterialBudget(p0, p1) : mMatLUT->getMatBudget(p0.X(), p0.Y(), p0.Z(), p1.X(), p1.Y(), p1.Z());
-  }
+  MatBudget getMatBudget(int corrType, const Point3D<float>& p0, const Point3D<float>& p1) const;
 
   const o2::field::MagFieldFast* mField = nullptr; ///< External fast field (barrel only for the moment)
   float mBz = 0;                                   // nominal field
diff --git a/Detectors/Base/src/Propagator.cxx b/Detectors/Base/src/Propagator.cxx
@@ -9,6 +9,7 @@
 // or submit itself to any jurisdiction.
 
 #include "DetectorsBase/Propagator.h"
+#include "DetectorsBase/GeometryManager.h"
 #include <FairLogger.h>
 #include <FairRunAna.h> // eventually will get rid of it
 #include <TGeoGlobalMagField.h>
@@ -245,3 +246,9 @@ int Propagator::initFieldFromGRP(const o2::parameters::GRPObject* grp)
 
   return 0;
 }
+
+//____________________________________________________________
+MatBudget Propagator::getMatBudget(int corrType, const Point3D<float>& p0, const Point3D<float>& p1) const
+{
+  return (corrType == USEMatCorrTGeo) ? GeometryManager::meanMaterialBudget(p0, p1) : mMatLUT->getMatBudget(p0.X(), p0.Y(), p0.Z(), p1.X(), p1.Y(), p1.Z());
+}
