Merge branch 'SurfaceUnique_ptr_move_to_surface' into 'master'

SurfaceUniquePtrT move to TrkEventPrimitives

See merge request atlas/athena!34910

Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/Surface.h

@@ -16,10 +16,10 @@
 #include "TrkEventPrimitives/LocalParameters.h"
 #include "TrkEventPrimitives/ParamDefs.h"
 #include "TrkEventPrimitives/PropDirection.h"
+#include "TrkEventPrimitives/SurfaceUniquePtrT.h"
 #include "TrkParametersBase/Charged.h"
 #include "TrkParametersBase/Neutral.h"
 #include "TrkParametersBase/ParametersBase.h"
-#include "TrkParametersBase/SurfaceUniquePtrT.h"
 #include "TrkSurfaces/BoundaryCheck.h"
 #include "TrkSurfaces/DistanceSolution.h"
 // Amg

Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/SurfaceUniquePtrT.h → Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/SurfaceUniquePtrT.h

@@ -13,13 +13,11 @@
  */
 
 
-#ifndef TRKPARAMETERSBASE_SURFACEUNIQUEPTRT_H
-#define TRKPARAMETERSBASE_SURFACEUNIQUEPTRT_H
-
+#ifndef TRKEVENTPRIMITIVES_SURFACEUNIQUEPTRT_H
+#define TRKEVENTPRIMITIVES_SURFACEUNIQUEPTRT_H
 
 namespace Trk {
 
-
 template <class S>
 class SurfaceDeleter
 {
@@ -29,12 +27,9 @@ public:
   }
 };
 
-
 template <class S>
 using SurfaceUniquePtrT = std::unique_ptr<S, SurfaceDeleter<S> >;
 
-
 } // namespace Trk
 
-
-#endif // not TRKPARAMETERSBASE_SURFACEUNIQUEPTRT_H
+#endif 

Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h

@@ -9,17 +9,14 @@
 #ifndef TRKPARAMETERSBASE_CURVILINEARPARAMETERS_T_H
 #define TRKPARAMETERSBASE_CURVILINEARPARAMETERS_T_H
 
-// STL
-#include <memory>
+#include "TrkParametersBase/ParametersBase.h"
 
-// Amg
 #include "EventPrimitives/EventPrimitives.h"
 #include "GeoPrimitives/GeoPrimitives.h"
-// Tracking includes
 #include "TrkEventPrimitives/CurvilinearUVT.h"
-#include "TrkParametersBase/ParametersBase.h"
-#include "TrkParametersBase/SurfaceUniquePtrT.h"
+#include "TrkEventPrimitives/SurfaceUniquePtrT.h"
 
+#include <memory>
 class MsgStream;
 
 namespace Trk {

Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h

@@ -9,12 +9,10 @@
 #ifndef TRKPARAMETERSBASE_PARAMETERS_T_H
 #define TRKPARAMETERSBASE_PARAMETERS_T_H
 
-// Trk includes
 #include "TrkParametersBase/ParametersBase.h"
-// Amg
 #include "EventPrimitives/EventPrimitives.h"
 #include "GeoPrimitives/GeoPrimitives.h"
-#include "TrkParametersBase/SurfaceUniquePtrT.h"
+#include "TrkEventPrimitives/SurfaceUniquePtrT.h"
 
 /*
  * Needed for persistency