From 2917f5bfce60bddd62f054eeb9885364f1398f6c Mon Sep 17 00:00:00 2001 From: David Shope Date: Wed, 27 Apr 2022 00:03:02 +0200 Subject: [PATCH] Consolidate HGTD reconstruction tools into a single package --- .../ATLAS_CHECK_THREAD_SAFETY | 1 + .../HGTD_RecToolInterfaces/CMakeLists.txt | 0 .../IHGTD_ClusterTruthTool.h | 0 .../IHGTD_PadClusterizationTool.h | 0 .../IHGTD_TOFcorrectionTool.h | 0 .../IHGTD_TrackTimeExtensionTool.h | 0 .../HGTD_RecTools/ATLAS_CHECK_THREAD_SAFETY | 1 + .../HGTD_RecTools/CMakeLists.txt | 16 ++++++++++++++++ .../ATLAS_CHECK_THREAD_SAFETY | 1 - .../HGTD_PadClusterizationTools/CMakeLists.txt | 11 ----------- .../HGTD_PadClusterizationTools_entries.cxx | 5 ----- .../ATLAS_CHECK_THREAD_SAFETY | 1 - .../ATLAS_CHECK_THREAD_SAFETY | 1 - .../HGTD_TimeCalibrationTools/CMakeLists.txt | 13 ------------- .../HGTD_TimeCalibrationTools_entries.cxx | 3 --- .../ATLAS_CHECK_THREAD_SAFETY | 1 - .../HGTD_TrackTimeExtensionTools/CMakeLists.txt | 14 -------------- .../HGTD_TrackTimeExtensionTools_entries.cxx | 3 --- .../HGTD_TruthTools/ATLAS_CHECK_THREAD_SAFETY | 1 - .../HGTD_RecTools/HGTD_TruthTools/CMakeLists.txt | 13 ------------- .../src/components/HGTD_TruthTools_entries.cxx | 3 --- .../src/ClusterTruthTool.cxx | 2 +- .../{HGTD_TruthTools => }/src/ClusterTruthTool.h | 6 +++--- .../src/HGTD_ClusterMakerTool.cxx | 2 +- .../src/HGTD_ClusterMakerTool.h | 2 +- .../src/HGTD_IterativeExtensionTool.cxx | 2 +- .../src/HGTD_IterativeExtensionTool.h | 0 .../src/SinglePadClusterTool.cxx | 2 +- .../src/SinglePadClusterTool.h | 2 +- .../src/StraightLineTOFcorrectionTool.cxx | 2 +- .../src/StraightLineTOFcorrectionTool.h | 0 .../src/components/HGTD_RecTools_entries.cxx | 11 +++++++++++ 32 files changed, 39 insertions(+), 80 deletions(-) create mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY rename HighGranularityTimingDetector/HGTD_Reconstruction/{HGTD_RecTools => }/HGTD_RecToolInterfaces/CMakeLists.txt (100%) rename HighGranularityTimingDetector/HGTD_Reconstruction/{HGTD_RecTools => }/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_ClusterTruthTool.h (100%) rename HighGranularityTimingDetector/HGTD_Reconstruction/{HGTD_RecTools => }/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_PadClusterizationTool.h (100%) rename HighGranularityTimingDetector/HGTD_Reconstruction/{HGTD_RecTools => }/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TOFcorrectionTool.h (100%) rename HighGranularityTimingDetector/HGTD_Reconstruction/{HGTD_RecTools => }/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TrackTimeExtensionTool.h (100%) create mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/ATLAS_CHECK_THREAD_SAFETY create mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/CMakeLists.txt delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/ATLAS_CHECK_THREAD_SAFETY delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/CMakeLists.txt delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/components/HGTD_PadClusterizationTools_entries.cxx delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/ATLAS_CHECK_THREAD_SAFETY delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/CMakeLists.txt delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/components/HGTD_TimeCalibrationTools_entries.cxx delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/ATLAS_CHECK_THREAD_SAFETY delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/CMakeLists.txt delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/components/HGTD_TrackTimeExtensionTools_entries.cxx delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/ATLAS_CHECK_THREAD_SAFETY delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/CMakeLists.txt delete mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/components/HGTD_TruthTools_entries.cxx rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_TruthTools => }/src/ClusterTruthTool.cxx (99%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_TruthTools => }/src/ClusterTruthTool.h (93%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_PadClusterizationTools => }/src/HGTD_ClusterMakerTool.cxx (96%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_PadClusterizationTools => }/src/HGTD_ClusterMakerTool.h (97%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_TrackTimeExtensionTools => }/src/HGTD_IterativeExtensionTool.cxx (99%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_TrackTimeExtensionTools => }/src/HGTD_IterativeExtensionTool.h (100%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_PadClusterizationTools => }/src/SinglePadClusterTool.cxx (98%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_PadClusterizationTools => }/src/SinglePadClusterTool.h (96%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_TimeCalibrationTools => }/src/StraightLineTOFcorrectionTool.cxx (97%) rename HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/{HGTD_TimeCalibrationTools => }/src/StraightLineTOFcorrectionTool.h (100%) create mode 100644 HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/components/HGTD_RecTools_entries.cxx diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 00000000000..d419c7a7866 --- /dev/null +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/CMakeLists.txt b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/CMakeLists.txt similarity index 100% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/CMakeLists.txt rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/CMakeLists.txt diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_ClusterTruthTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_ClusterTruthTool.h similarity index 100% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_ClusterTruthTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_ClusterTruthTool.h diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_PadClusterizationTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_PadClusterizationTool.h similarity index 100% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_PadClusterizationTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_PadClusterizationTool.h diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TOFcorrectionTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TOFcorrectionTool.h similarity index 100% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TOFcorrectionTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TOFcorrectionTool.h diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TrackTimeExtensionTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TrackTimeExtensionTool.h similarity index 100% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TrackTimeExtensionTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecToolInterfaces/HGTD_RecToolInterfaces/IHGTD_TrackTimeExtensionTool.h diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/ATLAS_CHECK_THREAD_SAFETY b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 00000000000..66315e26d4e --- /dev/null +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/CMakeLists.txt b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/CMakeLists.txt new file mode 100644 index 00000000000..e20f94e6e17 --- /dev/null +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration + +# Declare the package name: +atlas_subdir( HGTD_RecTools ) + +find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) + +# Component(s) in the package: +atlas_add_component( HGTD_RecTools + src/*.cxx + src/components/*.cxx + LINK_LIBRARIES AthenaBaseComps GaudiKernel + HGTD_RecToolInterfaces HGTD_PrepRawData HGTD_ReadoutGeometry + HGTD_Identifier HGTD_RIO_OnTrack TrkExInterfaces + TrkToolInterfaces TrkGeometry TrkTrack TrkDetDescrUtils + GeneratorObjects ${ROOT_LIBRARIES} InDetSimData xAODTruth ) diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/ATLAS_CHECK_THREAD_SAFETY b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/ATLAS_CHECK_THREAD_SAFETY deleted file mode 100644 index 47b842f79c4..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/ATLAS_CHECK_THREAD_SAFETY +++ /dev/null @@ -1 +0,0 @@ -HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/CMakeLists.txt b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/CMakeLists.txt deleted file mode 100644 index 9f15aae316a..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration - -# Declare the package name: -atlas_subdir( HGTD_PadClusterizationTools ) - -# Component(s) in the package: -atlas_add_component( HGTD_PadClusterizationTools - src/*.cxx - src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps GaudiKernel - HGTD_RecToolInterfaces HGTD_PrepRawData HGTD_ReadoutGeometry) diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/components/HGTD_PadClusterizationTools_entries.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/components/HGTD_PadClusterizationTools_entries.cxx deleted file mode 100644 index d34efeb0d70..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/components/HGTD_PadClusterizationTools_entries.cxx +++ /dev/null @@ -1,5 +0,0 @@ -#include "../HGTD_ClusterMakerTool.h" -#include "../SinglePadClusterTool.h" - -DECLARE_COMPONENT(HGTD_ClusterMakerTool) -DECLARE_COMPONENT(HGTD::SinglePadClusterTool) diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY deleted file mode 100644 index 7b03097dee3..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces/ATLAS_CHECK_THREAD_SAFETY +++ /dev/null @@ -1 +0,0 @@ -HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_RecToolInterfaces diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/ATLAS_CHECK_THREAD_SAFETY b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/ATLAS_CHECK_THREAD_SAFETY deleted file mode 100644 index 7bccb29b57b..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/ATLAS_CHECK_THREAD_SAFETY +++ /dev/null @@ -1 +0,0 @@ -HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/CMakeLists.txt b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/CMakeLists.txt deleted file mode 100644 index 25a78cc4efe..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration - -# Declare the package name: -atlas_subdir( HGTD_TimeCalibrationTools ) - -# Component(s) in the package: -atlas_add_component( HGTD_TimeCalibrationTools - src/*.cxx - src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps GaudiKernel - HGTD_RecToolInterfaces HGTD_ReadoutGeometry TrkTrack - HGTD_PrepRawData) - diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/components/HGTD_TimeCalibrationTools_entries.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/components/HGTD_TimeCalibrationTools_entries.cxx deleted file mode 100644 index 3bd9d2a6d91..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/components/HGTD_TimeCalibrationTools_entries.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include "../StraightLineTOFcorrectionTool.h" - -DECLARE_COMPONENT( HGTD::StraightLineTOFcorrectionTool ) diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/ATLAS_CHECK_THREAD_SAFETY b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/ATLAS_CHECK_THREAD_SAFETY deleted file mode 100644 index 0decdd5f89e..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/ATLAS_CHECK_THREAD_SAFETY +++ /dev/null @@ -1 +0,0 @@ -HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/CMakeLists.txt b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/CMakeLists.txt deleted file mode 100644 index c4564c13c7a..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration - -# Declare the package name: -atlas_subdir( HGTD_TrackTimeExtensionTools ) - -# Component(s) in the package: -atlas_add_component( HGTD_TrackTimeExtensionTools - src/*.cxx - src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps GaudiKernel TrkGeometry TrkTrack - HGTD_RecToolInterfaces TrkExInterfaces HGTD_PrepRawData - TrkDetDescrUtils HGTD_ReadoutGeometry HGTD_Identifier - HGTD_RIO_OnTrack TrkToolInterfaces) - diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/components/HGTD_TrackTimeExtensionTools_entries.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/components/HGTD_TrackTimeExtensionTools_entries.cxx deleted file mode 100644 index 4d113e8fe44..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/components/HGTD_TrackTimeExtensionTools_entries.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include "../HGTD_IterativeExtensionTool.h" - -DECLARE_COMPONENT( HGTD_IterativeExtensionTool ) diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/ATLAS_CHECK_THREAD_SAFETY b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/ATLAS_CHECK_THREAD_SAFETY deleted file mode 100644 index 53cbec94a89..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/ATLAS_CHECK_THREAD_SAFETY +++ /dev/null @@ -1 +0,0 @@ -HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/CMakeLists.txt b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/CMakeLists.txt deleted file mode 100644 index 36a61550795..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration - -# Declare the package name: -atlas_subdir( HGTD_TruthTools ) - -find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) - -atlas_add_component( HGTD_TruthTools - src/*.cxx - src/components/*.cxx - LINK_LIBRARIES AthenaBaseComps GaudiKernel - HGTD_RecToolInterfaces GeneratorObjects ${ROOT_LIBRARIES} - HGTD_PrepRawData InDetSimData xAODTruth) diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/components/HGTD_TruthTools_entries.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/components/HGTD_TruthTools_entries.cxx deleted file mode 100644 index a3fb3ef2058..00000000000 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/components/HGTD_TruthTools_entries.cxx +++ /dev/null @@ -1,3 +0,0 @@ -#include "../ClusterTruthTool.h" - -DECLARE_COMPONENT( HGTD::ClusterTruthTool ) diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/ClusterTruthTool.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/ClusterTruthTool.cxx similarity index 99% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/ClusterTruthTool.cxx rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/ClusterTruthTool.cxx index 972b8993d6f..6628fdc9ebd 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/ClusterTruthTool.cxx +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/ClusterTruthTool.cxx @@ -1,7 +1,7 @@ /** * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration. * - * @file HGTD_TruthTools/src/ClusterTruthTool.cxx + * @file HGTD_RecTools/src/ClusterTruthTool.cxx * * @author Alexander Leopold * @author Noemi Calace diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/ClusterTruthTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/ClusterTruthTool.h similarity index 93% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/ClusterTruthTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/ClusterTruthTool.h index 8392b9d681e..a9fc0361414 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TruthTools/src/ClusterTruthTool.h +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/ClusterTruthTool.h @@ -12,8 +12,8 @@ * https://gitlab.cern.ch/aleopold/memleakhunt/-/blob/master/TrkExtrapolation/TrkExTools/src/TrackTimingExtensionAlg.cxx#L901 */ -#ifndef HGTD_TRUTHTOOLS_CLUSTERTRUTHTOOL_H -#define HGTD_TRUTHTOOLS_CLUSTERTRUTHTOOL_H +#ifndef HGTD_RECTOOLS_CLUSTERTRUTHTOOL_H +#define HGTD_RECTOOLS_CLUSTERTRUTHTOOL_H #include "AthenaBaseComps/AthAlgTool.h" #include "HGTD_RecToolInterfaces/IHGTD_ClusterTruthTool.h" @@ -53,4 +53,4 @@ public: } // namespace HGTD -#endif // HGTD_TRUTHTOOLS_CLUSTERTRUTHTOOL_H +#endif // HGTD_RECTOOLS_CLUSTERTRUTHTOOL_H diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/HGTD_ClusterMakerTool.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_ClusterMakerTool.cxx similarity index 96% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/HGTD_ClusterMakerTool.cxx rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_ClusterMakerTool.cxx index d43848d8d51..e6b143cfb81 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/HGTD_ClusterMakerTool.cxx +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_ClusterMakerTool.cxx @@ -1,7 +1,7 @@ /** * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration. * - * @file HGTD_ClusterMakerTools/src/HGTD_ClusterMakerTool.cxx + * @file HGTD_RecTools/src/HGTD_ClusterMakerTool.cxx * @author Alexander Leopold * @date August, 2021 * diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/HGTD_ClusterMakerTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_ClusterMakerTool.h similarity index 97% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/HGTD_ClusterMakerTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_ClusterMakerTool.h index 3d1a9bb51c5..92ebcdacc94 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/HGTD_ClusterMakerTool.h +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_ClusterMakerTool.h @@ -1,7 +1,7 @@ /** * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration. * - * @file HGTD_ClusterMakerTools/HGTD_ClusterMakerTool.h + * @file HGTD_ClusterMakerTool.h * @author Alexander Leopold * @date August, 2021 * diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/HGTD_IterativeExtensionTool.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_IterativeExtensionTool.cxx similarity index 99% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/HGTD_IterativeExtensionTool.cxx rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_IterativeExtensionTool.cxx index d734aad236b..0288a60b1f6 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/HGTD_IterativeExtensionTool.cxx +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_IterativeExtensionTool.cxx @@ -1,7 +1,7 @@ /** * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration. * - * @file HGTD_TrackTimeExtensionTools/src/HGTD_IterativeExtensionTool.cxx + * @file HGTD_RecTools/src/HGTD_IterativeExtensionTool.cxx * @author Noemi Calace * @author Alexander Leopold * @date August, 2021 diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/HGTD_IterativeExtensionTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_IterativeExtensionTool.h similarity index 100% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TrackTimeExtensionTools/src/HGTD_IterativeExtensionTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/HGTD_IterativeExtensionTool.h diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/SinglePadClusterTool.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/SinglePadClusterTool.cxx similarity index 98% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/SinglePadClusterTool.cxx rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/SinglePadClusterTool.cxx index d61fe6c0d3d..97ee930f49d 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/SinglePadClusterTool.cxx +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/SinglePadClusterTool.cxx @@ -1,7 +1,7 @@ /** * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration. * - * @file HGTD_ClusterMakerTools/src/SinglePadClusterTool.cxx + * @file HGTD_RecTools/src/SinglePadClusterTool.cxx * @author Alexander Leopold * @date August, 2021 * diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/SinglePadClusterTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/SinglePadClusterTool.h similarity index 96% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/SinglePadClusterTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/SinglePadClusterTool.h index a2ecccb9816..cd6324d7c4d 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_PadClusterizationTools/src/SinglePadClusterTool.h +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/SinglePadClusterTool.h @@ -1,7 +1,7 @@ /** * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration. * - * @file HGTD_ClusterMakerTools/SinglePadClusterTool.h + * @file SinglePadClusterTool.h * @author Alexander Leopold * @date August, 2021 * diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/StraightLineTOFcorrectionTool.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/StraightLineTOFcorrectionTool.cxx similarity index 97% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/StraightLineTOFcorrectionTool.cxx rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/StraightLineTOFcorrectionTool.cxx index 0218cf14cd1..5d538abd8c8 100644 --- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/StraightLineTOFcorrectionTool.cxx +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/StraightLineTOFcorrectionTool.cxx @@ -1,7 +1,7 @@ /** * Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration. * - * @file HGTD_TimeCalibrationTools/src/StraightLineTOFcorrectionTool.h + * @file HGTD_RecTools/src/StraightLineTOFcorrectionTool.cxx * @author Alexander Leopold * @date August, 2021 * diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/StraightLineTOFcorrectionTool.h b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/StraightLineTOFcorrectionTool.h similarity index 100% rename from HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/HGTD_TimeCalibrationTools/src/StraightLineTOFcorrectionTool.h rename to HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/StraightLineTOFcorrectionTool.h diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/components/HGTD_RecTools_entries.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/components/HGTD_RecTools_entries.cxx new file mode 100644 index 00000000000..665f3894814 --- /dev/null +++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_RecTools/src/components/HGTD_RecTools_entries.cxx @@ -0,0 +1,11 @@ +#include "../ClusterTruthTool.h" +#include "../HGTD_ClusterMakerTool.h" +#include "../HGTD_IterativeExtensionTool.h" +#include "../SinglePadClusterTool.h" +#include "../StraightLineTOFcorrectionTool.h" + +DECLARE_COMPONENT( HGTD::ClusterTruthTool ) +DECLARE_COMPONENT( HGTD_ClusterMakerTool ) +DECLARE_COMPONENT( HGTD_IterativeExtensionTool ) +DECLARE_COMPONENT( HGTD::SinglePadClusterTool ) +DECLARE_COMPONENT( HGTD::StraightLineTOFcorrectionTool ) -- GitLab