refactor: Group all ROOT writers together (acts-project#3746)

Our ROOT writers are quite scattered and I would like to group them back together.
Rosie-Hasan · Nov 13, 2024 · 62e918c · 62e918c
1 parent 04d941e
commit 62e918c
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 38 deletions.
diff --git a/Examples/Io/CMakeLists.txt b/Examples/Io/CMakeLists.txt
@@ -2,8 +2,6 @@ add_subdirectory(Csv)
 add_subdirectory_if(EDM4hep ACTS_BUILD_EXAMPLES_EDM4HEP)
 add_subdirectory_if(HepMC3 ACTS_BUILD_EXAMPLES_HEPMC3)
 add_subdirectory(Json)
-add_subdirectory(NuclearInteractions)
 add_subdirectory(Obj)
-add_subdirectory(Performance)
 add_subdirectory(Root)
 add_subdirectory_if(Svg ACTS_BUILD_PLUGIN_ACTSVG)
diff --git a/Examples/Io/NuclearInteractions/CMakeLists.txt b/Examples/Io/NuclearInteractions/CMakeLists.txt
diff --git a/Examples/Io/Root/CMakeLists.txt b/Examples/Io/Root/CMakeLists.txt
@@ -23,6 +23,13 @@ add_library(
     src/RootVertexReader.cpp
     src/RootVertexWriter.cpp
     src/RootAthenaDumpReader.cpp
+    src/RootNuclearInteractionParametersWriter.cpp
+    src/detail/NuclearInteractionParametrisation.cpp
+    src/CKFPerformanceWriter.cpp
+    src/SeedingPerformanceWriter.cpp
+    src/TrackFinderPerformanceWriter.cpp
+    src/TrackFitterPerformanceWriter.cpp
+    src/VertexPerformanceWriter.cpp
 )
 target_include_directories(
     ActsExamplesIoRoot

diff --git a/...s/Io/Performance/CKFPerformanceWriter.hpp → ...Examples/Io/Root/CKFPerformanceWriter.hpp b/...s/Io/Performance/CKFPerformanceWriter.hpp → ...Examples/Io/Root/CKFPerformanceWriter.hpp
diff --git a/...ootNuclearInteractionParametersWriter.hpp → ...ootNuclearInteractionParametersWriter.hpp b/...ootNuclearInteractionParametersWriter.hpp → ...ootNuclearInteractionParametersWriter.hpp
@@ -12,7 +12,7 @@
 #include "ActsExamples/EventData/ExtractedSimulationProcess.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
 #include "ActsExamples/Framework/WriterT.hpp"
-#include "ActsExamples/Io/NuclearInteractions/detail/NuclearInteractionParametrisation.hpp"
+#include "ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp"
 
 #include <mutex>
 #include <string>

diff --git a/.../Performance/SeedingPerformanceWriter.hpp → ...ples/Io/Root/SeedingPerformanceWriter.hpp b/.../Performance/SeedingPerformanceWriter.hpp → ...ples/Io/Root/SeedingPerformanceWriter.hpp
diff --git a/...formance/TrackFinderPerformanceWriter.hpp → .../Io/Root/TrackFinderPerformanceWriter.hpp b/...formance/TrackFinderPerformanceWriter.hpp → .../Io/Root/TrackFinderPerformanceWriter.hpp
diff --git a/...formance/TrackFitterPerformanceWriter.hpp → .../Io/Root/TrackFitterPerformanceWriter.hpp b/...formance/TrackFitterPerformanceWriter.hpp → .../Io/Root/TrackFitterPerformanceWriter.hpp
diff --git a/...o/Performance/VertexPerformanceWriter.hpp → ...mples/Io/Root/VertexPerformanceWriter.hpp b/...o/Performance/VertexPerformanceWriter.hpp → ...mples/Io/Root/VertexPerformanceWriter.hpp
diff --git a/...ail/NuclearInteractionParametrisation.hpp → ...ail/NuclearInteractionParametrisation.hpp b/...ail/NuclearInteractionParametrisation.hpp → ...ail/NuclearInteractionParametrisation.hpp
diff --git a/...s/Io/Performance/CKFPerformanceWriter.cpp → ...ples/Io/Root/src/CKFPerformanceWriter.cpp b/...s/Io/Performance/CKFPerformanceWriter.cpp → ...ples/Io/Root/src/CKFPerformanceWriter.cpp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/CKFPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/CKFPerformanceWriter.hpp"
 
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"

diff --git a/...ootNuclearInteractionParametersWriter.cpp → ...ootNuclearInteractionParametersWriter.cpp b/...ootNuclearInteractionParametersWriter.cpp → ...ootNuclearInteractionParametersWriter.cpp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/NuclearInteractions/RootNuclearInteractionParametersWriter.hpp"
+#include "ActsExamples/Io/Root/RootNuclearInteractionParametersWriter.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Common.hpp"

diff --git a/.../Performance/SeedingPerformanceWriter.cpp → .../Io/Root/src/SeedingPerformanceWriter.cpp b/.../Performance/SeedingPerformanceWriter.cpp → .../Io/Root/src/SeedingPerformanceWriter.cpp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "SeedingPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/SeedingPerformanceWriter.hpp"
 
 #include "Acts/Utilities/MultiIndex.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"

diff --git a/...formance/TrackFinderPerformanceWriter.cpp → ...Root/src/TrackFinderPerformanceWriter.cpp b/...formance/TrackFinderPerformanceWriter.cpp → ...Root/src/TrackFinderPerformanceWriter.cpp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/TrackFinderPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFinderPerformanceWriter.hpp"
 
 #include "Acts/Definitions/Units.hpp"
 #include "ActsExamples/EventData/Index.hpp"

diff --git a/...formance/TrackFitterPerformanceWriter.cpp → ...Root/src/TrackFitterPerformanceWriter.cpp b/...formance/TrackFitterPerformanceWriter.cpp → ...Root/src/TrackFitterPerformanceWriter.cpp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/TrackFitterPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFitterPerformanceWriter.hpp"
 
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/TrackParameters.hpp"

diff --git a/...o/Performance/VertexPerformanceWriter.cpp → ...s/Io/Root/src/VertexPerformanceWriter.cpp b/...o/Performance/VertexPerformanceWriter.cpp → ...s/Io/Root/src/VertexPerformanceWriter.cpp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/VertexPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/VertexPerformanceWriter.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"

diff --git a/...ail/NuclearInteractionParametrisation.cpp → ...ail/NuclearInteractionParametrisation.cpp b/...ail/NuclearInteractionParametrisation.cpp → ...ail/NuclearInteractionParametrisation.cpp
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/NuclearInteractions/detail/NuclearInteractionParametrisation.hpp"
+#include "ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp"
 
 #include "Acts/Definitions/Common.hpp"
 #include "ActsFatras/EventData/Particle.hpp"

diff --git a/Examples/Python/CMakeLists.txt b/Examples/Python/CMakeLists.txt
@@ -54,11 +54,9 @@ target_link_libraries(
         ActsExamplesDetectorTGeo
         ActsExamplesMagneticField
         ActsExamplesIoRoot
-        ActsExamplesIoNuclearInteractions
         ActsExamplesIoCsv
         ActsExamplesIoObj
         ActsExamplesIoJson
-        ActsExamplesIoPerformance
         ActsExamplesGenerators
         ActsExamplesPrinters
         ActsExamplesTrackFinding

diff --git a/Examples/Python/src/Output.cpp b/Examples/Python/src/Output.cpp
@@ -26,16 +26,12 @@
 #include "ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvTrackWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp"
-#include "ActsExamples/Io/NuclearInteractions/RootNuclearInteractionParametersWriter.hpp"
-#include "ActsExamples/Io/Performance/CKFPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/SeedingPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/TrackFinderPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/TrackFitterPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/VertexPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/CKFPerformanceWriter.hpp"
 #include "ActsExamples/Io/Root/RootBFieldWriter.hpp"
 #include "ActsExamples/Io/Root/RootMaterialTrackWriter.hpp"
 #include "ActsExamples/Io/Root/RootMaterialWriter.hpp"
 #include "ActsExamples/Io/Root/RootMeasurementWriter.hpp"
+#include "ActsExamples/Io/Root/RootNuclearInteractionParametersWriter.hpp"
 #include "ActsExamples/Io/Root/RootParticleWriter.hpp"
 #include "ActsExamples/Io/Root/RootPropagationStepsWriter.hpp"
 #include "ActsExamples/Io/Root/RootPropagationSummaryWriter.hpp"
@@ -46,6 +42,10 @@
 #include "ActsExamples/Io/Root/RootTrackStatesWriter.hpp"
 #include "ActsExamples/Io/Root/RootTrackSummaryWriter.hpp"
 #include "ActsExamples/Io/Root/RootVertexWriter.hpp"
+#include "ActsExamples/Io/Root/SeedingPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFinderPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFitterPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/VertexPerformanceWriter.hpp"
 #include "ActsExamples/MaterialMapping/IMaterialWriter.hpp"
 #include "ActsExamples/Plugins/Obj/ObjPropagationStepsWriter.hpp"
 #include "ActsExamples/Plugins/Obj/ObjTrackingGeometryWriter.hpp"