Merge branch 'cmake.EFTrackingEmulation-20240514' into 'main'

EFTrackingEmulation: cmake fixes

See merge request !71358

Trigger/EFTracking/EFTrackingEmulation/CMakeLists.txt

@@ -3,9 +3,9 @@
 atlas_subdir ( EFTrackingEmulation )
 
 atlas_add_library (EFTrackingEmulationLib
-  EFTrackingEmulation/*.h src/*.cxx src/FitFunctions/* 
+  EFTrackingEmulation/*.h src/*.cxx 
   NO_PUBLIC_HEADERS
-  LINK_LIBRARIES AnaAlgorithmLib xAODTruth xAODTracking TrkEventTPCnv TrkEventPrimitives)
+  LINK_LIBRARIES AnaAlgorithmLib xAODTruth xAODTracking TrkEventPrimitives)
 
 
 atlas_add_component (EFTrackingEmulation

Trigger/EFTracking/EFTrackingEmulation/src/EFTrackingSmearingAlg.cxx

 /*
-   Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
  
 
@@ -9,7 +9,7 @@
 #include "TH1.h"
 
 #ifndef XAOD_ANALYSIS
-#include "TrkEventTPCnv/helpers/EigenHelpers.h"
+#include "EventPrimitives/EventPrimitivesHelpers.h"
 #include "TrkEventPrimitives/ParamDefs.h"
 #else
 
@@ -43,15 +43,6 @@ namespace Amg
    }
 }
 
-// from Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/helpers/EigenHelpers.h
-namespace EigenHelpers 
-{
-  template <class VECTOR, class COVARIANCE> 
-   inline static void eigenMatrixToVector(VECTOR& vec, COVARIANCE& cov, const char* ) {                                                    
-       Amg::compress(cov, vec);                                          
-     }
-}
-
 namespace Trk
 {
   enum ParamDefs        {
@@ -88,6 +79,17 @@ namespace Trk
 #endif
 
 
+// from Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/helpers/EigenHelpers.h
+namespace EigenHelpers 
+{
+  template <class VECTOR, class COVARIANCE> 
+   inline static void eigenMatrixToVector(VECTOR& vec, COVARIANCE& cov, const char* ) {                                                    
+       Amg::compress(cov, vec);                                          
+     }
+}
+
+
+
 EFTrackingSmearingAlg::EFTrackingSmearingAlg( const std::string& name, ISvcLocator* pSvcLocator ) 
 : AthHistogramAlgorithm( name, pSvcLocator ){}