From e02b79f577a84b5f70c759ec6aeab020f52dfd63 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Tue, 14 Jun 2022 16:31:59 -0700
Subject: [PATCH] Clean-up Acts headers
---
.../FaserActsDetectorElement.h | 4 +-
.../src/FaserActsAlignmentCondAlg.cxx | 2 +-
.../FaserActsAlignmentCondAlg.h | 0
.../src/FaserActsDetectorElement.cxx | 2 +-
.../src/FaserActsExtrapolationAlg.cxx | 4 +-
.../FaserActsExtrapolationAlg.h | 0
.../src/FaserActsExtrapolationTool.cxx | 6 +-
.../FaserActsExtrapolationTool.h | 0
.../src/FaserActsMaterialJsonWriterTool.cxx | 2 +-
.../FaserActsMaterialJsonWriterTool.h | 0
.../src/FaserActsMaterialMapping.cxx | 4 +-
.../FaserActsMaterialMapping.h | 0
.../src/FaserActsObjWriterTool.cxx | 2 +-
.../FaserActsObjWriterTool.h | 0
.../src/FaserActsPropStepRootWriterSvc.cxx | 2 +-
.../FaserActsPropStepRootWriterSvc.h | 2 +-
.../src/FaserActsSurfaceMappingTool.cxx | 4 +-
.../FaserActsSurfaceMappingTool.h | 0
.../src/FaserActsTrackingGeometrySvc.cxx | 2 +-
.../FaserActsTrackingGeometrySvc.h | 0
.../src/FaserActsTrackingGeometryTool.cxx | 2 +-
.../FaserActsTrackingGeometryTool.h | 0
.../src/FaserActsVolumeMappingTool.cxx | 5 +-
.../FaserActsVolumeMappingTool.h | 0
.../src/FaserActsWriteTrackingGeometry.cxx | 2 +-
.../FaserActsWriteTrackingGeometry.h | 6 +-
.../src/FaserNominalAlignmentCondAlg.cxx | 2 +-
.../FaserNominalAlignmentCondAlg.h | 0
.../components/FaserActsGeometry_entries.cxx | 24 +++----
.../IFaserActsExCellWriterSvc.h | 0
.../IFaserActsPropStepRootWriterSvc.h | 0
.../Acts/FaserActsKalmanFilter/CMakeLists.txt | 72 +++++++++----------
.../FaserActsKalmanFilter/.__afsCDFD | 71 ------------------
.../FaserActsKalmanFilter/ITrackFinderTool.h | 10 ++-
.../FaserActsKalmanFilter/ITrackSeedTool.h | 10 ++-
.../FaserActsKalmanFilter/IndexSourceLink.h | 9 ++-
.../src/ActsTrackSeedTool.cxx | 2 +-
.../ActsTrackSeedTool.h | 0
.../Acts/FaserActsKalmanFilter/src/CKF2.cxx | 6 +-
.../{FaserActsKalmanFilter => src}/CKF2.h | 10 +--
.../FaserActsKalmanFilter/src/CircleFit.cxx | 2 +-
.../CircleFit.h | 0
.../src/CircleFitTrackSeedTool.cxx | 8 +--
.../CircleFitTrackSeedTool.h | 0
.../src/ClusterTrackSeedTool.cxx | 2 +-
.../ClusterTrackSeedTool.h | 0
.../src/CombinatorialKalmanFilterAlg.cxx | 6 +-
.../CombinatorialKalmanFilterAlg.h | 14 ++--
.../FaserActsKalmanFilter/src/EffPlotTool.cxx | 2 +-
.../EffPlotTool.h | 2 +-
.../FASERSourceLink.h | 0
.../src/FaserActsKalmanFilterAlg.cxx | 6 +-
.../FaserActsKalmanFilterAlg.h | 9 ++-
.../FaserActsRecMultiTrajectory.h | 0
.../src/GhostBusters.cxx | 2 +-
.../GhostBusters.h | 2 +-
.../src/KalmanFitterTool.cxx | 2 +-
.../KalmanFitterTool.h | 6 +-
.../LinearFit.h | 0
.../src/MultiTrackFinderTool.cxx | 2 +-
.../MultiTrackFinderTool.h | 6 +-
.../src/MyAmbiguitySolver.cxx | 2 +-
.../MyAmbiguitySolver.h | 2 +-
.../src/MyTrackSeedTool.cxx | 2 +-
.../MyTrackSeedTool.h | 0
.../src/PerformanceWriterTool.cxx | 4 +-
.../PerformanceWriterTool.h | 6 +-
.../FaserActsKalmanFilter/src/PlotHelpers.cxx | 2 +-
.../PlotHelpers.h | 0
.../src/ProtoTrackWriterTool.cxx | 2 +-
.../ProtoTrackWriterTool.h | 0
.../FaserActsKalmanFilter/src/ResPlotTool.cxx | 2 +-
.../ResPlotTool.h | 2 +-
.../src/RootTrajectoryStatesWriterTool.cxx | 21 +++---
.../RootTrajectoryStatesWriterTool.h | 1 +
.../src/RootTrajectorySummaryWriterTool.cxx | 12 ++--
.../RootTrajectorySummaryWriterTool.h | 0
.../src/SPSeedBasedInitialParameterTool.cxx | 2 +-
.../SPSeedBasedInitialParameterTool.h | 0
.../src/SPSimpleInitialParameterTool.cxx | 2 +-
.../SPSimpleInitialParameterTool.h | 0
.../FaserActsKalmanFilter/src/SeedingAlg.cxx | 2 +-
.../SeedingAlg.h | 0
.../src/SegmentFitClusterTrackFinderTool.cxx | 2 +-
.../SegmentFitClusterTrackFinderTool.h | 6 +-
.../src/SegmentFitTrackFinderTool.cxx | 2 +-
.../SegmentFitTrackFinderTool.h | 6 +-
.../src/SimWriterTool.cxx | 2 +-
.../SimWriterTool.h | 0
.../src/SummaryPlotTool.cxx | 2 +-
.../SummaryPlotTool.h | 2 +-
.../src/ThreeStationTrackSeedTool.cxx | 2 +-
.../ThreeStationTrackSeedTool.h | 0
.../src/TrackClassification.cxx | 2 +-
.../TrackClassification.h | 2 +-
.../src/TrackFindingAlgorithmFunction.cxx | 2 +-
.../src/TrackFittingFunction.cxx | 2 +-
.../src/TrackSeedWriterTool.cxx | 2 +-
.../TrackSeedWriterTool.h | 0
.../src/TrackSelection.cxx | 5 +-
.../TrackSelection.h | 2 +-
.../src/TrajectoryWriterTool.cxx | 4 +-
.../TrajectoryWriterTool.h | 0
.../src/TruthBasedInitialParameterTool.cxx | 2 +-
.../TruthBasedInitialParameterTool.h | 2 +-
.../src/TruthSeededTrackFinderTool.cxx | 2 +-
.../TruthSeededTrackFinderTool.h | 6 +-
.../src/TruthTrackFinderTool.cxx | 2 +-
.../TruthTrackFinderTool.h | 4 +-
.../FaserActsKalmanFilter_entries.cxx | 52 +++++++-------
110 files changed, 233 insertions(+), 284 deletions(-)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsAlignmentCondAlg.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsExtrapolationAlg.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsExtrapolationTool.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsMaterialJsonWriterTool.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsMaterialMapping.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsObjWriterTool.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsPropStepRootWriterSvc.h (97%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsSurfaceMappingTool.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsTrackingGeometrySvc.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsTrackingGeometryTool.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsVolumeMappingTool.h (100%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserActsWriteTrackingGeometry.h (80%)
rename Tracking/Acts/FaserActsGeometry/{FaserActsGeometry => src}/FaserNominalAlignmentCondAlg.h (100%)
rename Tracking/Acts/{FaserActsGeometry/FaserActsGeometry => FaserActsGeometryInterfaces/FaserActsGeometryInterfaces}/IFaserActsExCellWriterSvc.h (100%)
rename Tracking/Acts/{FaserActsGeometry/FaserActsGeometry => FaserActsGeometryInterfaces/FaserActsGeometryInterfaces}/IFaserActsPropStepRootWriterSvc.h (100%)
delete mode 100644 Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/.__afsCDFD
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/ActsTrackSeedTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/CKF2.h (95%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/CircleFit.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/CircleFitTrackSeedTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/ClusterTrackSeedTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/CombinatorialKalmanFilterAlg.h (93%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/EffPlotTool.h (97%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/FASERSourceLink.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/FaserActsKalmanFilterAlg.h (94%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/FaserActsRecMultiTrajectory.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/GhostBusters.h (98%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/KalmanFitterTool.h (95%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/LinearFit.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/MultiTrackFinderTool.h (98%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/MyAmbiguitySolver.h (97%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/MyTrackSeedTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/PerformanceWriterTool.h (93%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/PlotHelpers.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/ProtoTrackWriterTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/ResPlotTool.h (98%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/RootTrajectoryStatesWriterTool.h (99%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/RootTrajectorySummaryWriterTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/SPSeedBasedInitialParameterTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/SPSimpleInitialParameterTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/SeedingAlg.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/SegmentFitClusterTrackFinderTool.h (97%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/SegmentFitTrackFinderTool.h (96%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/SimWriterTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/SummaryPlotTool.h (98%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/ThreeStationTrackSeedTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/TrackClassification.h (92%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/TrackSeedWriterTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/TrackSelection.h (90%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/TrajectoryWriterTool.h (100%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/TruthBasedInitialParameterTool.h (95%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/TruthSeededTrackFinderTool.h (97%)
rename Tracking/Acts/FaserActsKalmanFilter/{FaserActsKalmanFilter => src}/TruthTrackFinderTool.h (97%)
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h b/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h
index c65bdb69..f2576d69 100644
--- a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h
+++ b/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsDetectorElement.h
@@ -24,7 +24,7 @@ namespace Acts {
class SurfaceBounds;
}
-class FaserActsTrackingGeometrySvc;
+class IFaserActsTrackingGeometrySvc;
class FaserActsAlignmentStore;
class IdentityHelper;
@@ -87,7 +87,7 @@ private:
mutable std::mutex m_cacheMutex;
mutable std::shared_ptr<const Acts::Transform3> m_defTransform;
- const FaserActsTrackingGeometrySvc* m_trackingGeometrySvc;
+ const IFaserActsTrackingGeometrySvc* m_trackingGeometrySvc;
Identifier m_explicitIdentifier;
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx
index 8c913b6a..5f0735b9 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsAlignmentCondAlg.h"
+#include "FaserActsAlignmentCondAlg.h"
// ATHENA
#include "EventInfo/EventID.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsAlignmentCondAlg.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsAlignmentCondAlg.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsAlignmentCondAlg.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx
index 2a790d18..58ad59dc 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx
@@ -11,7 +11,7 @@
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
// PACKAGE
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
+// #include "FaserActsTrackingGeometrySvc.h"
#include "FaserActsGeometry/FaserActsAlignmentStore.h"
#include "FaserActsGeometry/FaserActsGeometryContext.h"
#include "ActsInterop/IdentityHelper.h"
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx
index 0eca15c2..429b5cb7 100755
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsExtrapolationAlg.h"
+#include "FaserActsExtrapolationAlg.h"
// ATHENA
#include "AthenaKernel/RNGWrapper.h"
@@ -24,7 +24,7 @@
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
#include "ActsInterop/Logger.h"
#include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
//#include "FaserActsGeometry/IFaserActsMaterialTrackWriterSvc.h"
// OTHER
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationAlg.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationAlg.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
index c5351bfa..77485eb7 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
@@ -2,15 +2,15 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsExtrapolationTool.h"
+#include "FaserActsExtrapolationTool.h"
// ATHENA
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/PhysicalConstants.h"
// PACKAGE
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+// #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometrySvc.h"
+// #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
#include "ActsInterop/Logger.h"
// ACTS
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx
index feeb6f7a..86c97a2c 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsMaterialJsonWriterTool.h"
+#include "FaserActsMaterialJsonWriterTool.h"
#include "ActsInterop/Logger.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialJsonWriterTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialJsonWriterTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx
index 37031b41..fd3e6e15 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsMaterialMapping.h"
+#include "FaserActsMaterialMapping.h"
// ATHENA
#include "Acts/Surfaces/PerigeeSurface.hpp"
@@ -18,7 +18,7 @@
// PACKAGE
#include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
// STL
#include <fstream>
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialMapping.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialMapping.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialMapping.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx
index 35da191f..e6ac8720 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsObjWriterTool.h"
+#include "FaserActsObjWriterTool.h"
// std
#include <iostream>
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsObjWriterTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsObjWriterTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx
index 6d24eba8..18b41772 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsPropStepRootWriterSvc.h"
+#include "FaserActsPropStepRootWriterSvc.h"
#include "GaudiKernel/IInterface.h"
#include "Acts/Propagator/detail/SteppingLogger.hpp"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsPropStepRootWriterSvc.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.h
similarity index 97%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsPropStepRootWriterSvc.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.h
index eeca580e..42a3b526 100644
--- a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsPropStepRootWriterSvc.h
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsPropStepRootWriterSvc.h
@@ -9,7 +9,7 @@
#include "GaudiKernel/IInterface.h"
#include "Gaudi/Property.h" /*no forward decl: typedef*/
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
#include "Acts/EventData/TrackParameters.hpp"
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
index ac647013..ac5494ad 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
@@ -2,14 +2,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsSurfaceMappingTool.h"
+#include "FaserActsSurfaceMappingTool.h"
// ATHENA
#include "GaudiKernel/IInterface.h"
// PACKAGE
#include "ActsInterop/Logger.h"
#include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+// #include "FaserActsTrackingGeometryTool.h"
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
// ACTS
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsSurfaceMappingTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsSurfaceMappingTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx
index 94c85274..a8091afa 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
+#include "FaserActsTrackingGeometrySvc.h"
// ATHENA
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometrySvc.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometrySvc.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx
index aae04e8f..98a0ff23 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+#include "FaserActsTrackingGeometryTool.h"
// ATHENA
#include "GaudiKernel/EventContext.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometryTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometryTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
index 796ad74e..5e893ade 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsVolumeMappingTool.h"
+#include "FaserActsVolumeMappingTool.h"
// ATHENA
#include "GaudiKernel/IInterface.h"
@@ -10,9 +10,8 @@
// PACKAGE
#include "FaserActsGeometry/FaserActsGeometryContext.h"
#include "ActsInterop/Logger.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
//#include "ActsGeometry/ActsGeometryContext.h"
-#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
+// #include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
// ACTS
#include "Acts/Propagator/Navigator.hpp"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsVolumeMappingTool.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsVolumeMappingTool.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx
index 3e05c12a..2ac697d2 100755
--- a/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.cxx
@@ -1,7 +1,7 @@
/*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsWriteTrackingGeometry.h"
+#include "FaserActsWriteTrackingGeometry.h"
// ATHENA
#include "AthenaKernel/RNGWrapper.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsWriteTrackingGeometry.h b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.h
similarity index 80%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsWriteTrackingGeometry.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.h
index 2de2fef9..4b877274 100755
--- a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsWriteTrackingGeometry.h
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserActsWriteTrackingGeometry.h
@@ -13,8 +13,8 @@
#include "GaudiKernel/ISvcLocator.h"
// PACKAGE
-#include "FaserActsGeometry/FaserActsObjWriterTool.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
+#include "FaserActsObjWriterTool.h"
+#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
// STL
#include <fstream>
@@ -36,7 +36,7 @@ public:
private:
- ToolHandle<FaserActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"};
+ ToolHandle<IFaserActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"};
ToolHandle<FaserActsObjWriterTool> m_objWriterTool{this, "ObjWriterTool", "FaserActsObjWriterTool"};
diff --git a/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx b/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx
index 5edcda8c..2068df0e 100644
--- a/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserNominalAlignmentCondAlg.h"
+#include "FaserNominalAlignmentCondAlg.h"
// ATHENA
#include "StoreGate/WriteCondHandle.h"
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserNominalAlignmentCondAlg.h b/Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserNominalAlignmentCondAlg.h
rename to Tracking/Acts/FaserActsGeometry/src/FaserNominalAlignmentCondAlg.h
diff --git a/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx b/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx
index 7beb0342..1adfac54 100755
--- a/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx
+++ b/Tracking/Acts/FaserActsGeometry/src/components/FaserActsGeometry_entries.cxx
@@ -2,24 +2,24 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsGeometry/FaserActsExtrapolationAlg.h"
-#include "FaserActsGeometry/FaserActsWriteTrackingGeometry.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometrySvc.h"
-#include "FaserActsGeometry/FaserActsExtrapolationTool.h"
-#include "FaserActsGeometry/FaserActsObjWriterTool.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
-#include "FaserActsGeometry/FaserActsPropStepRootWriterSvc.h"
-#include "FaserActsGeometry/FaserActsAlignmentCondAlg.h"
-#include "FaserActsGeometry/FaserNominalAlignmentCondAlg.h"
+#include "../FaserActsExtrapolationAlg.h"
+#include "../FaserActsWriteTrackingGeometry.h"
+#include "../FaserActsTrackingGeometrySvc.h"
+#include "../FaserActsExtrapolationTool.h"
+#include "../FaserActsObjWriterTool.h"
+#include "../FaserActsTrackingGeometryTool.h"
+#include "../FaserActsPropStepRootWriterSvc.h"
+#include "../FaserActsAlignmentCondAlg.h"
+#include "../FaserNominalAlignmentCondAlg.h"
//#include "FaserActsGeometry/FaserActsKalmanFilterAlg.h"
//#include "FaserActsGeometry/FaserActsExCellWriterSvc.h"
//#include "FaserActsGeometry/FaserActsMaterialTrackWriterSvc.h"
//#include "FaserActsGeometry/GeomShiftCondAlg.h"
//#include "FaserActsGeometry/FaserActsWriteTrackingGeometryTransforms.h"
-#include "FaserActsGeometry/FaserActsVolumeMappingTool.h"
+#include "../FaserActsVolumeMappingTool.h"
//#include "FaserActsGeometry/FaserActsMaterialJsonWriterTool.h"
-#include "FaserActsGeometry/FaserActsMaterialMapping.h"
-#include "FaserActsGeometry/FaserActsSurfaceMappingTool.h"
+#include "../FaserActsMaterialMapping.h"
+#include "../FaserActsSurfaceMappingTool.h"
DECLARE_COMPONENT( FaserActsTrackingGeometrySvc )
DECLARE_COMPONENT( FaserActsTrackingGeometryTool )
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsExCellWriterSvc.h b/Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsExCellWriterSvc.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsExCellWriterSvc.h
rename to Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsExCellWriterSvc.h
diff --git a/Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h b/Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h
similarity index 100%
rename from Tracking/Acts/FaserActsGeometry/FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h
rename to Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
index 22f075ab..6e9c7dc2 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
@@ -25,48 +25,48 @@ atlas_add_library( FaserActsKalmanFilterLib
)
atlas_add_component(FaserActsKalmanFilter
- FaserActsKalmanFilter/ActsTrackSeedTool.h
- FaserActsKalmanFilter/CircleFit.h
- FaserActsKalmanFilter/CircleFitTrackSeedTool.h
- FaserActsKalmanFilter/CKF2.h
- FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
- FaserActsKalmanFilter/EffPlotTool.h
- FaserActsKalmanFilter/FASERSourceLink.h
+ ActsTrackSeedTool.h
+ CircleFit.h
+ CircleFitTrackSeedTool.h
+ CKF2.h
+ CombinatorialKalmanFilterAlg.h
+ EffPlotTool.h
+ FASERSourceLink.h
FaserActsKalmanFilter/FaserActsGeometryContainers.h
- FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
- FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h
- FaserActsKalmanFilter/GhostBusters.h
- FaserActsKalmanFilter/MyTrackSeedTool.h
+ FaserActsKalmanFilterAlg.h
+ FaserActsRecMultiTrajectory.h
+ GhostBusters.h
+ MyTrackSeedTool.h
FaserActsKalmanFilter/IdentifierLink.h
FaserActsKalmanFilter/IndexSourceLink.h
FaserActsKalmanFilter/ITrackFinderTool.h
FaserActsKalmanFilter/ITrackSeedTool.h
- FaserActsKalmanFilter/KalmanFitterTool.h
- FaserActsKalmanFilter/LinearFit.h
-# FaserActsKalmanFilter/ClusterTrackSeedTool.h
-# FaserActsKalmanFilter/TruthTrackFinderTool.h
+ KalmanFitterTool.h
+ LinearFit.h
+# ClusterTrackSeedTool.h
+# TruthTrackFinderTool.h
FaserActsKalmanFilter/Measurement.h
-# FaserActsKalmanFilter/MultiTrackFinderTool.h
- FaserActsKalmanFilter/PerformanceWriterTool.h
- FaserActsKalmanFilter/PlotHelpers.h
- FaserActsKalmanFilter/ResPlotTool.h
- FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h
- FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h
- FaserActsKalmanFilter/SeedingAlg.h
-# FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h
-# FaserActsKalmanFilter/SegmentFitTrackFinderTool.h
- FaserActsKalmanFilter/SimWriterTool.h
- FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h
- FaserActsKalmanFilter/SPSimpleInitialParameterTool.h
- FaserActsKalmanFilter/SummaryPlotTool.h
- FaserActsKalmanFilter/TrackClassification.h
- FaserActsKalmanFilter/TrackSeedWriterTool.h
- FaserActsKalmanFilter/TrackSelection.h
- FaserActsKalmanFilter/TrajectoryWriterTool.h
-# FaserActsKalmanFilter/ProtoTrackWriterTool.h
- FaserActsKalmanFilter/TruthBasedInitialParameterTool.h
-# FaserActsKalmanFilter/TruthSeededTrackFinderTool.h
- FaserActsKalmanFilter/ThreeStationTrackSeedTool.h
+# MultiTrackFinderTool.h
+ PerformanceWriterTool.h
+ PlotHelpers.h
+ ResPlotTool.h
+ RootTrajectoryStatesWriterTool.h
+ RootTrajectorySummaryWriterTool.h
+ SeedingAlg.h
+# SegmentFitClusterTrackFinderTool.h
+# SegmentFitTrackFinderTool.h
+ SimWriterTool.h
+ SPSeedBasedInitialParameterTool.h
+ SPSimpleInitialParameterTool.h
+ SummaryPlotTool.h
+ TrackClassification.h
+ TrackSeedWriterTool.h
+ TrackSelection.h
+ TrajectoryWriterTool.h
+# ProtoTrackWriterTool.h
+ TruthBasedInitialParameterTool.h
+# TruthSeededTrackFinderTool.h
+ ThreeStationTrackSeedTool.h
src/ActsTrackSeedTool.cxx
src/CircleFit.cxx
src/CircleFitTrackSeedTool.cxx
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/.__afsCDFD b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/.__afsCDFD
deleted file mode 100644
index c066165b..00000000
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/.__afsCDFD
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef COMBINATORIALKALMANFILTERALG_H
-#define COMBINATORIALKALMANFILTERALG_H
-
-#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "TrackerSpacePoint/FaserSCT_SpacePointContainer.h"
-#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
-#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
-#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
-#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
-#include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
-#include "Acts/TrackFinding/MeasurementSelector.hpp"
-#include "FaserActsKalmanFilter/Measurement.h"
-#include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
-#include "TrkTrack/TrackCollection.h"
-
-class FaserSCT_ID;
-
-namespace Trk
-{
-class TrackStateOnSurface;
-}
-
-namespace TrackerDD {
- class SCT_DetectorManager;
-}
-
-class CombinatorialKalmanFilterAlg : public AthReentrantAlgorithm {
- public:
- CombinatorialKalmanFilterAlg(const std::string& name, ISvcLocator* pSvcLocator);
- virtual ~CombinatorialKalmanFilterAlg() = default;
-
- StatusCode initialize() override;
- StatusCode execute(const EventContext& ctx) const override;
- StatusCode finalize() override;
-
- using TrackFinderOptions =
- Acts::CombinatorialKalmanFilterOptions<IndexSourceLinkAccessor, MeasurementCalibrator, Acts::MeasurementSelector>;
- using FitterResult = Acts::Result<Acts::CombinatorialKalmanFilterResult<IndexSourceLink>>;
- using TrackFinderResult = std::vector<FitterResult>;
-// using TrackFinderResult = std::vector<
-// Acts::Result<Acts::CombinatorialKalmanFilterResult<IndexSourceLink>>>;
- using TrackFinderFunction = std::function<TrackFinderResult(
- const IndexSourceLinkContainer&, const std::vector<Acts::CurvilinearTrackParameters>&,
- const TrackFinderOptions&)>;
-
- static TrackFinderFunction makeTrackFinderFunction(
- std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry);
-
- Acts::MagneticFieldContext getMagneticFieldContext(const EventContext& ctx) const;
-
-
- private:
- const FaserSCT_ID* m_idHelper{nullptr};
- const TrackerDD::SCT_DetectorManager* m_detManager{nullptr};
-
- std::unique_ptr<Trk::Track> makeTrack(Acts::GeometryContext& tgContext, FitterResult& fitResult, std::vector<Tracker::FaserSCT_SpacePoint> seed_spcollection) const;
- const Trk::TrackParameters* ConvertActsTrackParameterToATLAS(const Acts::BoundTrackParameters &actsParameter, const Acts::GeometryContext& gctx) const;
-
- SG::WriteHandleKey<TrackCollection> m_trackCollection { this, "FaserActsCKFTrackCollection", "FaserActsCKFTrackCollection", "Output trackcollectionname" };
-
- ToolHandle<IFaserActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", "FaserActsTrackingGeometryTool"};
- ToolHandle<SPSeedBaseInitialParameterTool> m_initialParameterTool{this, "InitialParameterTool", "SPSeedBaseInitialParameterTool"};
- //ToolHandle<SPSimpleInitialParameterTool> m_initialParameterTool{this, "InitialParameterTool", "SPSimpleInitialParameterTool"};
- //ToolHandle<TruthBasedInitialParameterTool> m_initialParameterTool{this, "InitialParameterTool", "TruthBasedInitialParameterTool"};
- ToolHandle<TrajectoryWriterTool> m_trajectoryWriterTool{this, "OutputTool", "TrajectoryWriterTool"};
- SG::ReadCondHandleKey<FaserFieldCacheCondObj> m_fieldCondObjInputKey {this, "FaserFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
- SG::ReadHandleKey<FaserSCT_SpacePointContainer> m_SpacePointContainerKey{this, "SpacePointsSCTName", "SCT_SpacePointContainer", "SCT space point container"};
-};
-
-#endif // COMBINATORIALKALMANFILTERALG_H
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h
index 6fbc80c4..af5eb919 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackFinderTool.h
@@ -1,7 +1,7 @@
#ifndef FASERACTSKALMANFILTER_ITRACKFINDERTOOL_H
#define FASERACTSKALMANFILTER_ITRACKFINDERTOOL_H
-#include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
+// #include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/IAlgTool.h"
#include "FaserActsKalmanFilter/IndexSourceLink.h"
@@ -9,6 +9,12 @@
#include "FaserActsKalmanFilter/Measurement.h"
#include "Acts/EventData/TrackParameters.hpp"
+namespace Tracker
+{
+ class FaserSCT_Cluster;
+ class FaserSCT_SpacePoint;
+}
+
class ITrackFinderTool : virtual public IAlgTool {
public:
DeclareInterfaceID(ITrackFinderTool, 1, 0);
@@ -20,7 +26,7 @@ public:
virtual const std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> sourceLinks() const = 0;
virtual const std::shared_ptr<std::vector<IdentifierLink>> idLinks() const = 0;
virtual const std::shared_ptr<std::vector<std::vector<Measurement>>> measurements() const = 0;
- virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints() const = 0;
+ virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints() const = 0;
virtual const std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters() const = 0;
};
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h
index 0b664f78..238fbb13 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ITrackSeedTool.h
@@ -7,8 +7,14 @@
#include "FaserActsKalmanFilter/IdentifierLink.h"
#include "FaserActsKalmanFilter/Measurement.h"
#include "Acts/EventData/TrackParameters.hpp"
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
+// #include "TrackerSpacePoint/FaserSCT_SpacePoint.h"
+
+namespace Tracker
+{
+ class FaserSCT_Cluster;
+ class FaserSCT_SpacePoint;
+}
class ITrackSeedTool : virtual public IAlgTool {
public:
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h
index 79973020..2e6a2a78 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h
@@ -14,8 +14,13 @@
#include <boost/container/flat_map.hpp>
-#include "FaserActsKalmanFilter/FaserActsGeometryContainers.h"
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
+#include "FaserActsGeometryContainers.h"
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
+namespace Tracker
+{
+ class FaserSCT_Cluster;
+}
+
/// Index type to reference elements in a container.
///
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx
index 013e242d..b311727d 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ActsTrackSeedTool.h"
+#include "ActsTrackSeedTool.h"
#include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ActsTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ActsTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ActsTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
index 371c752a..d0d6f213 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CKF2.h"
+#include "CKF2.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/ReadCondHandleKey.h"
@@ -15,10 +15,10 @@
#include "Acts/EventData/TrackParameters.hpp"
#include "FaserActsKalmanFilter/IndexSourceLink.h"
#include "FaserActsKalmanFilter/Measurement.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "Acts/Surfaces/PerigeeSurface.hpp"
#include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "FaserActsKalmanFilter/TrackSelection.h"
+#include "TrackSelection.h"
#include <algorithm>
#include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.h
similarity index 95%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CKF2.h
index da7baf0c..c6b42b02 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CKF2.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CKF2.h
@@ -12,13 +12,13 @@
#include "Acts/TrackFinding/MeasurementSelector.hpp"
#include "FaserActsKalmanFilter/Measurement.h"
#include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
+#include "TrajectoryWriterTool.h"
#include "TrkTrack/TrackCollection.h"
#include "FaserActsKalmanFilter/ITrackSeedTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/KalmanFitterTool.h"
+#include "RootTrajectoryStatesWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
+#include "PerformanceWriterTool.h"
+#include "KalmanFitterTool.h"
#include <boost/dynamic_bitset.hpp>
using ConstTrackStateProxy = Acts::detail_lt::TrackStateProxy<IndexSourceLink, 6, true>;
using ClusterSet = boost::dynamic_bitset<>;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx
index 9f1fab11..51048496 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CircleFit.h"
+#include "CircleFit.h"
namespace CircleFit {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFit.h b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFit.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CircleFit.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx
index 098b8360..e7c4f064 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CircleFitTrackSeedTool.h"
+#include "CircleFitTrackSeedTool.h"
#include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
@@ -6,9 +6,9 @@
#include "TrackerPrepRawData/FaserSCT_Cluster.h"
#include "Identifier/Identifier.h"
#include "Acts/Geometry/GeometryIdentifier.hpp"
-#include "FaserActsKalmanFilter/CircleFit.h"
-#include "FaserActsKalmanFilter/LinearFit.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "CircleFit.h"
+#include "LinearFit.h"
+#include "TrackClassification.h"
#include <array>
#include <algorithm>
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFitTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CircleFitTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CircleFitTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx
index 8d78c9f0..0e8265ec 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ClusterTrackSeedTool.h"
+#include "ClusterTrackSeedTool.h"
#include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ClusterTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ClusterTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ClusterTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
index 71afcc44..ee2a864b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h"
+#include "CombinatorialKalmanFilterAlg.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/ReadCondHandleKey.h"
@@ -15,10 +15,10 @@
#include "Acts/EventData/TrackParameters.hpp"
#include "FaserActsKalmanFilter/IndexSourceLink.h"
#include "FaserActsKalmanFilter/Measurement.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "Acts/Surfaces/PerigeeSurface.hpp"
#include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "FaserActsKalmanFilter/TrackSelection.h"
+#include "TrackSelection.h"
#include <algorithm>
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.h
similarity index 93%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.h
index 28058887..e4549a40 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/CombinatorialKalmanFilterAlg.h
@@ -6,19 +6,19 @@
#include "TrackerSpacePoint/FaserSCT_SpacePointContainer.h"
#include "TrackerPrepRawData/FaserSCT_ClusterContainer.h"
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
-//#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
+//#include "SPSimpleInitialParameterTool.h"
+//#include "SPSeedBasedInitialParameterTool.h"
#include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
#include "Acts/TrackFinding/MeasurementSelector.hpp"
#include "FaserActsKalmanFilter/Measurement.h"
#include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
+#include "TrajectoryWriterTool.h"
#include "TrkTrack/TrackCollection.h"
#include "FaserActsKalmanFilter/ITrackSeedTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "RootTrajectoryStatesWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
+#include "PerformanceWriterTool.h"
+#include "FaserActsRecMultiTrajectory.h"
#include <boost/dynamic_bitset.hpp>
using ConstTrackStateProxy = Acts::detail_lt::TrackStateProxy<IndexSourceLink, 6, true>;
using ClusterSet = boost::dynamic_bitset<>;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx
index 514fe540..e757c9c8 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/EffPlotTool.h"
+#include "EffPlotTool.h"
#include "Acts/Utilities/Helpers.hpp"
void EffPlotTool::book(EffPlotTool::EffPlotCache &effPlotCache) const {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/EffPlotTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/EffPlotTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.h
index e5af125d..63b92ad1 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/EffPlotTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/EffPlotTool.h
@@ -1,7 +1,7 @@
#ifndef FASERACTSKALMANFILTER_EFFPLOTTOOL_H
#define FASERACTSKALMANFILTER_EFFPLOTTOOL_H
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
#include "Acts/EventData/TrackParameters.hpp"
#include "HepMC/GenParticle.h"
#include "TEfficiency.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FASERSourceLink.h b/Tracking/Acts/FaserActsKalmanFilter/src/FASERSourceLink.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FASERSourceLink.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/FASERSourceLink.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx
index 67352412..f88b4e15 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h"
+#include "FaserActsKalmanFilterAlg.h"
// ATHENA
#include "GaudiKernel/EventContext.h"
@@ -43,7 +43,7 @@
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
#include "ActsInterop/Logger.h"
#include "FaserActsGeometry/FaserActsGeometryContext.h"
-#include "FaserActsGeometry/IFaserActsPropStepRootWriterSvc.h"
+#include "FaserActsGeometryInterfaces/IFaserActsPropStepRootWriterSvc.h"
#include "FaserActsGeometry/FaserActsDetectorElement.h"
#include "FaserActsKalmanFilter/IdentifierLink.h"
@@ -124,7 +124,7 @@ StatusCode FaserActsKalmanFilterAlg::execute() {
std::shared_ptr<std::vector<IdentifierLink>> idLinks = m_trackFinderTool->idLinks();
std::shared_ptr<std::vector<std::vector<Measurement>>> measurements =
m_trackFinderTool->measurements();
- std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints =
+ std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints =
m_trackFinderTool->spacePoints();
std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters =
m_trackFinderTool->clusters();
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.h
similarity index 94%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.h
index 34dd7c63..a2b4c729 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsKalmanFilterAlg.h
@@ -24,7 +24,7 @@
#include "GeneratorObjects/McEventCollection.h"
#include "TrackerSimData/TrackerSimDataCollection.h"
#include "TrkTrack/TrackCollection.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
+#include "TrajectoryWriterTool.h"
// ACTS
#include "Acts/MagneticField/ConstantBField.hpp"
@@ -42,15 +42,14 @@
// PACKAGE
#include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
-#include "FaserActsGeometry/FaserActsTrackingGeometryTool.h"
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
#include "FaserActsGeometryInterfaces/IFaserActsExtrapolationTool.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "FaserActsKalmanFilter/IndexSourceLink.h"
#include "FaserActsKalmanFilter/Measurement.h"
#include "FaserActsKalmanFilter/ITrackFinderTool.h"
-//#include "FaserActsKalmanFilter/ProtoTrackWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
+//#include "ProtoTrackWriterTool.h"
+#include "RootTrajectoryStatesWriterTool.h"
// STL
#include <memory>
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h b/Tracking/Acts/FaserActsKalmanFilter/src/FaserActsRecMultiTrajectory.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/FaserActsRecMultiTrajectory.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx
index 6cfb07d1..6eab8b1b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/GhostBusters.h"
+#include "GhostBusters.h"
#include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "TrackerPrepRawData/FaserSCT_Cluster.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/GhostBusters.h b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/GhostBusters.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.h
index f8ac55d6..67b493b4 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/GhostBusters.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/GhostBusters.h
@@ -5,7 +5,7 @@
#include "AthenaBaseComps/AthHistogramming.h"
#include "TrkTrack/TrackCollection.h"
#include "TrackerSimData/TrackerSimDataCollection.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
class TTree;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
index f1f8b1c6..6bb84678 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/KalmanFitterTool.h"
+#include "KalmanFitterTool.h"
#include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.h
similarity index 95%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.h
index 8bf92e91..9ed5b212 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/KalmanFitterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/KalmanFitterTool.h
@@ -8,10 +8,10 @@
#include "FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h"
#include "FaserActsKalmanFilter/IndexSourceLink.h"
#include "FaserActsKalmanFilter/Measurement.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "MagFieldConditions/FaserFieldCacheCondObj.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
+#include "RootTrajectoryStatesWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
#include "TrkTrack/Track.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/LinearFit.h b/Tracking/Acts/FaserActsKalmanFilter/src/LinearFit.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/LinearFit.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/LinearFit.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx
index f1044845..8b5b0e58 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/MultiTrackFinderTool.h"
+#include "MultiTrackFinderTool.h"
#include "Acts/Definitions/TrackParametrization.hpp"
#include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MultiTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MultiTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.h
index 56e5db26..988c50bd 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MultiTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MultiTrackFinderTool.h
@@ -36,7 +36,7 @@ public:
virtual const std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> sourceLinks() const override;
virtual const std::shared_ptr<std::vector<IdentifierLink>> idLinks() const override;
virtual const std::shared_ptr<std::vector<std::vector<Measurement>>> measurements() const override;
- virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints() const override;
+ virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints() const override;
virtual const std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters() const override;
struct Tracklet {
@@ -174,7 +174,7 @@ private:
std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> m_sourceLinks {};
std::shared_ptr<std::vector<IdentifierLink>> m_idLinks {};
std::shared_ptr<std::vector<std::vector<Measurement>>> m_measurements {};
- std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> m_spacePoints {};
+ std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> m_spacePoints {};
std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> m_clusters {};
const FaserSCT_ID* m_idHelper {nullptr};
@@ -219,7 +219,7 @@ MultiTrackFinderTool::measurements() const {
return m_measurements;
}
-inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>>
+inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>>
MultiTrackFinderTool::spacePoints() const {
return m_spacePoints;
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx
index 998269a8..eed78995 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.cxx
@@ -1,3 +1,3 @@
-#include "FaserActsKalmanFilter/MyAmbiguitySolver.h"
+#include "MyAmbiguitySolver.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyAmbiguitySolver.h b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyAmbiguitySolver.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.h
index 47257bef..bcb5a909 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyAmbiguitySolver.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MyAmbiguitySolver.h
@@ -2,7 +2,7 @@
#define FASERACTSKALMANFILTER_AMBIGUITYSOLVER_H
#include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
using CombinatorialKalmanFilterResult = Acts::CombinatorialKalmanFilterResult<IndexSourceLink>;
using TrackFitterResult = Acts::Result<CombinatorialKalmanFilterResult>;
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx
index c2648161..28e4c094 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/MyTrackSeedTool.h"
+#include "MyTrackSeedTool.h"
#include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/MyTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/MyTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
index c545c551..6565ef13 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.cxx
@@ -1,5 +1,5 @@
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "PerformanceWriterTool.h"
+#include "TrackClassification.h"
#include "Acts/EventData/MultiTrajectory.hpp"
#include "Acts/EventData/MultiTrajectoryHelpers.hpp"
#include "TFile.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PerformanceWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.h
similarity index 93%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PerformanceWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.h
index 198e4515..88d3372c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PerformanceWriterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/PerformanceWriterTool.h
@@ -3,9 +3,9 @@
#include "TrackerPrepRawData/FaserSCT_Cluster.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "FaserActsKalmanFilter/ResPlotTool.h"
-#include "FaserActsKalmanFilter/EffPlotTool.h"
-#include "FaserActsKalmanFilter/SummaryPlotTool.h"
+#include "ResPlotTool.h"
+#include "EffPlotTool.h"
+#include "SummaryPlotTool.h"
#include "FaserActsGeometryInterfaces/IFaserActsExtrapolationTool.h"
#include "TrackerSimData/TrackerSimDataCollection.h"
#include "GeneratorObjects/McEventCollection.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx
index 0d50d843..a5696dba 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
#include <cassert>
namespace PlotHelpers {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PlotHelpers.h b/Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/PlotHelpers.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/PlotHelpers.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx
index 5ec0dfc1..a8cad0d5 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ProtoTrackWriterTool.h"
+#include "ProtoTrackWriterTool.h"
#include "Acts/Geometry/GeometryIdentifier.hpp"
#include "Identifier/Identifier.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ProtoTrackWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ProtoTrackWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ProtoTrackWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx
index 47922a13..78c29b9e 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ResPlotTool.h"
+#include "ResPlotTool.h"
#include "Acts/Utilities/Helpers.hpp"
#include "HepMC/GenVertex.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ResPlotTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ResPlotTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.h
index 0b65984b..9b27be2b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ResPlotTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ResPlotTool.h
@@ -1,7 +1,7 @@
#ifndef FASERACTSKALMANFILTER_RESPLOTTOOL_H
#define FASERACTSKALMANFILTER_RESPLOTTOOL_H
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
#include "Acts/EventData/TrackParameters.hpp"
#include "Acts/Geometry/GeometryContext.hpp"
#include "HepMC/GenParticle.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
index 5378fc08..c46c1a0b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.cxx
@@ -1,15 +1,16 @@
+#include "RootTrajectoryStatesWriterTool.h"
+
#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
#include "Acts/EventData/MultiTrajectory.hpp"
#include "Acts/EventData/MultiTrajectoryHelpers.hpp"
#include "Acts/EventData/detail/TransformationBoundToFree.hpp"
#include "Acts/Utilities/Helpers.hpp"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
#include "TrackerReadoutGeometry/SiDetectorElement.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
#include <TFile.h>
#include <TTree.h>
@@ -281,8 +282,8 @@ StatusCode RootTrajectoryStatesWriterTool::write(const Acts::GeometryContext& gc
// Get the majority truth particle to this track
int barcode = NaNint;
- int truthQ = NaNint;
- float truthMomentum = NaNfloat;
+ // int truthQ = NaNint;
+ // float truthMomentum = NaNfloat;
float truthLOC0 = NaNfloat;
float truthLOC1 = NaNfloat;
float truthPHI = NaNfloat;
@@ -291,8 +292,8 @@ StatusCode RootTrajectoryStatesWriterTool::write(const Acts::GeometryContext& gc
float truthTIME = NaNfloat;
if (isMC) {
- truthQ = 1;
- truthMomentum = 1;
+ // truthQ = 1;
+ // truthMomentum = 1;
identifyContributingParticles(*simData, traj, trackTip, particleHitCounts);
if (not particleHitCounts.empty()) {
// Get the barcode of the majority truth particle
@@ -300,13 +301,13 @@ StatusCode RootTrajectoryStatesWriterTool::write(const Acts::GeometryContext& gc
// Find the truth particle via the barcode
auto ip = particles.find(barcode);
if (ip != particles.end()) {
- const auto& particle = ip->second;
+ // const auto& particle = ip->second;
ATH_MSG_DEBUG("Find the truth particle with barcode = " << barcode);
// Get the truth particle charge
// FIXME find better way to access charge of simulated particle, this does not work for
// pions which have a positive pdg code (211) and positive charge
- truthQ = particle->pdg_id() > 0 ? -1 : 1;
- truthMomentum = particle->momentum().rho() * m_MeV2GeV;
+ // truthQ = particle->pdg_id() > 0 ? -1 : 1;
+ // truthMomentum = particle->momentum().rho() * m_MeV2GeV;
} else {
ATH_MSG_WARNING("Truth particle with barcode = " << barcode << " not found!");
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.h
similarity index 99%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.h
index 6f0885d3..266de4bd 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectoryStatesWriterTool.h
@@ -1,6 +1,7 @@
#ifndef FASERACTSKALMANFILTER_ROOTTRAJECTORYSTATESWRITERTOOL_H
#define FASERACTSKALMANFILTER_ROOTTRAJECTORYSTATESWRITERTOOL_H
+#include "GeoPrimitives/GeoPrimitives.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "Acts/EventData/TrackParameters.hpp"
#include "Acts/Geometry/GeometryContext.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
index 76d76029..ef476a0b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.cxx
@@ -1,14 +1,15 @@
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
+#include "RootTrajectorySummaryWriterTool.h"
+
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
#include "Acts/EventData/MultiTrajectory.hpp"
#include "Acts/EventData/MultiTrajectoryHelpers.hpp"
#include "Acts/EventData/detail/TransformationBoundToFree.hpp"
#include "Acts/Utilities/Helpers.hpp"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
#include "TrackerReadoutGeometry/SiDetectorElement.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
#include "HepMC/GenParticle.h"
#include "HepMC/GenVertex.h"
#include <TFile.h>
@@ -254,7 +255,8 @@ StatusCode RootTrajectorySummaryWriterTool::write(
}
// Get the truth particle info at vertex
// const HepMC::GenVertex* vertex = particle->production_vertex();
- t_p = truthParameters->momentum().mag();
+ Acts::Vector3 v;
+ t_p = truthParameters->momentum().norm();
t_charge = truthParameters->charge();
t_time = truthParameters->time();
t_vx = truthParameters->position(geoContext).x();
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/RootTrajectorySummaryWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx
index f29ce6e8..bc8c89d8 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
+#include "SPSeedBasedInitialParameterTool.h"
#include "StoreGate/ReadHandle.h"
#include "HepMC/GenVertex.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SPSeedBasedInitialParameterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx
index f3d227dc..99549262 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
+#include "SPSimpleInitialParameterTool.h"
#include "StoreGate/ReadHandle.h"
#include "HepMC/GenVertex.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSimpleInitialParameterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SPSimpleInitialParameterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SPSimpleInitialParameterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx
index 5325703b..bc9bfab6 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SeedingAlg.h"
+#include "SeedingAlg.h"
SeedingAlg::SeedingAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator) {}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SeedingAlg.h b/Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SeedingAlg.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SeedingAlg.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx
index b1221525..c0a05121 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h"
+#include "SegmentFitClusterTrackFinderTool.h"
#include "Acts/Definitions/TrackParametrization.hpp"
#include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.h
index 6bf7ba69..d42ab5a2 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitClusterTrackFinderTool.h
@@ -36,7 +36,7 @@ public:
virtual const std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> sourceLinks() const override;
virtual const std::shared_ptr<std::vector<IdentifierLink>> idLinks() const override;
virtual const std::shared_ptr<std::vector<std::vector<Measurement>>> measurements() const override;
- virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> spacePoints() const override;
+ virtual const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> spacePoints() const override;
virtual const std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> clusters() const override;
private:
@@ -45,7 +45,7 @@ private:
std::shared_ptr<std::vector<std::vector<IndexSourceLink>>> m_sourceLinks {};
std::shared_ptr<std::vector<IdentifierLink>> m_idLinks {};
std::shared_ptr<std::vector<std::vector<Measurement>>> m_measurements {};
- std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>> m_spacePoints {};
+ std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>> m_spacePoints {};
std::shared_ptr<std::vector<std::vector<const Tracker::FaserSCT_Cluster*>>> m_clusters {};
const FaserSCT_ID* m_idHelper {nullptr};
@@ -93,7 +93,7 @@ SegmentFitClusterTrackFinderTool::measurements() const {
return m_measurements;
}
-inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint>>>
+inline const std::shared_ptr<std::vector<std::vector<Tracker::FaserSCT_SpacePoint*>>>
SegmentFitClusterTrackFinderTool::spacePoints() const {
return m_spacePoints;
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx
index 0aa77c3e..d1db42f9 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SegmentFitTrackFinderTool.h"
+#include "SegmentFitTrackFinderTool.h"
#include "Acts/Definitions/TrackParametrization.hpp"
#include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.h
similarity index 96%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.h
index 3f555be2..fa34f94c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SegmentFitTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SegmentFitTrackFinderTool.h
@@ -35,7 +35,7 @@ public:
virtual const std::shared_ptr<std::vector<IndexSourceLink>> sourceLinks() const override;
virtual const std::shared_ptr<IdentifierLink> idLinks() const override;
virtual const std::shared_ptr<std::vector<Measurement>> measurements() const override;
- virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> spacePoints() const override;
+ virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> spacePoints() const override;
private:
std::shared_ptr<const Acts::CurvilinearTrackParameters> m_initialTrackParameters;
@@ -43,7 +43,7 @@ private:
std::shared_ptr<std::vector<IndexSourceLink>> m_sourceLinks {};
std::shared_ptr<IdentifierLink> m_idLinks {};
std::shared_ptr<std::vector<Measurement>> m_measurements {};
- std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> m_spacePoints {};
+ std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> m_spacePoints {};
const FaserSCT_ID* m_idHelper {nullptr};
const TrackerDD::SCT_DetectorManager* m_detManager {nullptr};
@@ -91,7 +91,7 @@ inline const std::shared_ptr<std::vector<Measurement>>
return m_measurements;
}
-inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>>
+inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>>
SegmentFitTrackFinderTool::spacePoints() const {
return m_spacePoints;
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx
index 0e9a39a1..2b21fcba 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SimWriterTool.h"
+#include "SimWriterTool.h"
#include "TFile.h"
#include "TTree.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SimWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SimWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SimWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx
index f216042a..2ddb7610 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/SummaryPlotTool.h"
+#include "SummaryPlotTool.h"
#include <iostream>
void SummaryPlotTool::book(SummaryPlotTool::SummaryPlotCache &trackSummaryPlotCache) const {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SummaryPlotTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.h
similarity index 98%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SummaryPlotTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.h
index ea54ffc0..0bb6c326 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/SummaryPlotTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/SummaryPlotTool.h
@@ -1,7 +1,7 @@
#ifndef FASERACTSKALMANFILTER_SUMMARYPLOTTOOL_H
#define FASERACTSKALMANFILTER_SUMMARYPLOTTOOL_H
-#include "FaserActsKalmanFilter/PlotHelpers.h"
+#include "PlotHelpers.h"
#include "Acts/EventData/TrackParameters.hpp"
#include "TProfile.h"
#include <map>
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx
index 020c19b9..be491832 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/ThreeStationTrackSeedTool.h"
+#include "ThreeStationTrackSeedTool.h"
#include "TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ThreeStationTrackSeedTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/ThreeStationTrackSeedTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/ThreeStationTrackSeedTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx
index 6b780fc3..ed968270 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.cxx
@@ -1,5 +1,5 @@
#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/TrackClassification.h"
+#include "TrackClassification.h"
namespace {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackClassification.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.h
similarity index 92%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackClassification.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.h
index 2ca594c7..da59b9ba 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackClassification.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackClassification.h
@@ -1,7 +1,7 @@
#ifndef FASERACTSKALMANFILTER_TRACKCLASSIFICATION_H
#define FASERACTSKALMANFILTER_TRACKCLASSIFICATION_H
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "TrackerSimData/TrackerSimDataCollection.h"
struct ParticleHitCount {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx
index 44a86cbf..1a434fa8 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFindingAlgorithmFunction.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h"
+#include "CombinatorialKalmanFilterAlg.h"
#include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
#include "Acts/Propagator/EigenStepper.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx
index 0ece6266..460300ba 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackFittingFunction.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h"
+#include "FaserActsKalmanFilterAlg.h"
#include "FaserActsGeometry/FASERMagneticFieldWrapper.h"
#include "Acts/Propagator/EigenStepper.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx
index 820e53cb..4ec60768 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TrackSeedWriterTool.h"
+#include "TrackSeedWriterTool.h"
#include "TFile.h"
#include "TTree.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSeedWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSeedWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrackSeedWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx
index fdc77b13..b06019cf 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.cxx
@@ -1,5 +1,6 @@
-#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/TrackSelection.h"
+#include "TrackSelection.h"
+
+// #include "TrackerPrepRawData/FaserSCT_Cluster.h"
namespace {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSelection.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.h
similarity index 90%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSelection.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.h
index 858bb15c..aeebd0ff 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrackSelection.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrackSelection.h
@@ -1,7 +1,7 @@
#ifndef FASERACTSKALMANFILTER_TRACKSELECTION_H
#define FASERACTSKALMANFILTER_TRACKSELECTION_H
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "TrackerSimData/TrackerSimDataCollection.h"
#include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx
index 55dfda76..fc98f295 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.cxx
@@ -1,6 +1,6 @@
#include "TrackerPrepRawData/FaserSCT_Cluster.h"
-#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
-#include "FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h"
+#include "TrajectoryWriterTool.h"
+#include "FaserActsRecMultiTrajectory.h"
#include "Acts/EventData/MultiTrajectoryHelpers.hpp"
#include "TFile.h"
#include "TTree.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrajectoryWriterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.h
similarity index 100%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TrajectoryWriterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TrajectoryWriterTool.h
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx
index f5b850d8..8be51c43 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
+#include "TruthBasedInitialParameterTool.h"
#include "StoreGate/ReadHandle.h"
#include "HepMC/GenVertex.h"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthBasedInitialParameterTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.h
similarity index 95%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthBasedInitialParameterTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.h
index 6b94890f..f22a904c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthBasedInitialParameterTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthBasedInitialParameterTool.h
@@ -3,7 +3,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrackerSimData/TrackerSimDataCollection.h"
-#include "FaserActsKalmanFilter/SimWriterTool.h"
+#include "SimWriterTool.h"
namespace Acts {
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx
index 4a574ee9..f0d9796f 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TruthSeededTrackFinderTool.h"
+#include "TruthSeededTrackFinderTool.h"
#include "Acts/Definitions/TrackParametrization.hpp"
#include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthSeededTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthSeededTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.h
index 79425aa1..d07fcde1 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthSeededTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthSeededTrackFinderTool.h
@@ -50,7 +50,7 @@ public:
return m_measurements;
}
- virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> spacePoints() const override;
+ virtual const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> spacePoints() const override;
private:
std::shared_ptr<const Acts::CurvilinearTrackParameters> m_initialTrackParameters;
@@ -58,7 +58,7 @@ private:
std::shared_ptr<std::vector<IndexSourceLink>> m_sourceLinks {};
std::shared_ptr<IdentifierLink> m_idLinks {};
std::shared_ptr<std::vector<Measurement>> m_measurements {};
- std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> m_spacePoints {};
+ std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> m_spacePoints {};
const FaserSCT_ID* m_idHelper{nullptr};
const TrackerDD::SCT_DetectorManager* m_detManager{nullptr};
@@ -99,7 +99,7 @@ private:
Gaudi::Property<double> m_covTime {this, "covTime", 1};
};
-inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>>
+inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>>
TruthSeededTrackFinderTool::spacePoints() const {
return m_spacePoints;
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx
index 16882021..bfd5e9b7 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.cxx
@@ -1,4 +1,4 @@
-#include "FaserActsKalmanFilter/TruthTrackFinderTool.h"
+#include "TruthTrackFinderTool.h"
#include "Acts/Definitions/TrackParametrization.hpp"
#include "Acts/EventData/Measurement.hpp"
diff --git a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthTrackFinderTool.h b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.h
similarity index 97%
rename from Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthTrackFinderTool.h
rename to Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.h
index 3bfe35b6..37ac68be 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/TruthTrackFinderTool.h
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/TruthTrackFinderTool.h
@@ -55,7 +55,7 @@ private:
std::shared_ptr<std::vector<IndexSourceLink>> m_sourceLinks {};
std::shared_ptr<IdentifierLink> m_idLinks {};
std::shared_ptr<std::vector<Measurement>> m_measurements {};
- std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>> m_spacePoints {};
+ std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>> m_spacePoints {};
const FaserSCT_ID* m_idHelper{nullptr};
const TrackerDD::SCT_DetectorManager* m_detManager{nullptr};
@@ -95,7 +95,7 @@ private:
Gaudi::Property<int> m_first_side {this, "first_side", 1, "first side for which the initial track parameters are calculated"};
};
-inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint>>
+inline const std::shared_ptr<std::vector<Tracker::FaserSCT_SpacePoint*>>
TruthTrackFinderTool::spacePoints() const {
return m_spacePoints;
}
diff --git a/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx b/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx
index 4c23cb7f..dae1d0d1 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx
+++ b/Tracking/Acts/FaserActsKalmanFilter/src/components/FaserActsKalmanFilter_entries.cxx
@@ -2,32 +2,32 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h"
-#include "FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h"
-//#include "FaserActsKalmanFilter/MultiTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/TruthBasedInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/TruthTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/SPSeedBasedInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/SPSimpleInitialParameterTool.h"
-//#include "FaserActsKalmanFilter/TrajectoryWriterTool.h"
-//#include "FaserActsKalmanFilter/SimWriterTool.h"
-//#include "FaserActsKalmanFilter/TruthSeededTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/ProtoTrackWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectoryStatesWriterTool.h"
-#include "FaserActsKalmanFilter/RootTrajectorySummaryWriterTool.h"
-//#include "FaserActsKalmanFilter/SegmentFitClusterTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/SegmentFitTrackFinderTool.h"
-//#include "FaserActsKalmanFilter/ClusterTrackSeedTool.h"
-#include "FaserActsKalmanFilter/ThreeStationTrackSeedTool.h"
-#include "FaserActsKalmanFilter/PerformanceWriterTool.h"
-#include "FaserActsKalmanFilter/TrackSeedWriterTool.h"
-#include "FaserActsKalmanFilter/ActsTrackSeedTool.h"
-#include "FaserActsKalmanFilter/CKF2.h"
-#include "FaserActsKalmanFilter/KalmanFitterTool.h"
-#include "FaserActsKalmanFilter/MyTrackSeedTool.h"
-#include "FaserActsKalmanFilter/SeedingAlg.h"
-#include "FaserActsKalmanFilter/CircleFitTrackSeedTool.h"
-#include "FaserActsKalmanFilter/GhostBusters.h"
+#include "../FaserActsKalmanFilterAlg.h"
+#include "../CombinatorialKalmanFilterAlg.h"
+//#include "../MultiTrackFinderTool.h"
+//#include "../TruthBasedInitialParameterTool.h"
+//#include "../TruthTrackFinderTool.h"
+//#include "../SPSeedBasedInitialParameterTool.h"
+//#include "../SPSimpleInitialParameterTool.h"
+//#include "../TrajectoryWriterTool.h"
+//#include "../SimWriterTool.h"
+//#include "../TruthSeededTrackFinderTool.h"
+//#include "../ProtoTrackWriterTool.h"
+#include "../RootTrajectoryStatesWriterTool.h"
+#include "../RootTrajectorySummaryWriterTool.h"
+//#include "../SegmentFitClusterTrackFinderTool.h"
+//#include "../SegmentFitTrackFinderTool.h"
+//#include "../ClusterTrackSeedTool.h"
+#include "../ThreeStationTrackSeedTool.h"
+#include "../PerformanceWriterTool.h"
+#include "../TrackSeedWriterTool.h"
+#include "../ActsTrackSeedTool.h"
+#include "../CKF2.h"
+#include "../KalmanFitterTool.h"
+#include "../MyTrackSeedTool.h"
+#include "../SeedingAlg.h"
+#include "../CircleFitTrackSeedTool.h"
+#include "../GhostBusters.h"
DECLARE_COMPONENT(FaserActsKalmanFilterAlg)
DECLARE_COMPONENT(CombinatorialKalmanFilterAlg)
--
GitLab