refactor: Move Digitization from Plugins to Core (#1138)

This PR moves the SP builders and associated files from Plugins/Digitization to Core.
PR #1055 is split into two: reorganization of files (this PR) and updating the SP builder (will be opened shortly).
The whole Plugins/Digitization is moved to Core because the current SP builders depend on all files in Digitization, such as the DigitizationModule, PlannarModuleCluster, etc.

CMakeLists.txt

@@ -30,7 +30,6 @@ option(ACTS_BUILD_PLUGIN_AUTODIFF "Build the autodiff plugin" OFF)
 option(ACTS_USE_SYSTEM_AUTODIFF "Use autodiff provided by the system instead of the bundled version" OFF)
 option(ACTS_BUILD_PLUGIN_CUDA "Build CUDA plugin" OFF)
 option(ACTS_BUILD_PLUGIN_DD4HEP "Build DD4hep plugin" OFF)
-option(ACTS_BUILD_PLUGIN_DIGITIZATION "Build Digitization plugin" OFF)
 option(ACTS_BUILD_PLUGIN_IDENTIFICATION "Build Identification plugin" OFF)
 option(ACTS_BUILD_PLUGIN_JSON "Build json plugin" OFF)
 option(ACTS_USE_SYSTEM_NLOHMANN_JSON "Use nlohmann::json provided by the system instead of the bundled version" OFF)
@@ -96,9 +95,6 @@ set_option_if(
 set_option_if(
   ACTS_BUILD_PLUGIN_IDENTIFICATION
   ACTS_BUILD_PLUGIN_TGEO OR ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING)
-set_option_if(
-  ACTS_BUILD_PLUGIN_DIGITIZATION
-  ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING)
 set_option_if(
   ACTS_BUILD_PLUGIN_JSON
   ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING)

Core/CMakeLists.txt

@@ -51,6 +51,7 @@ install(
 
 # target source files are added separately
 add_subdirectory(src/EventData)
+add_subdirectory(src/Digitization)
 add_subdirectory(src/Geometry)
 add_subdirectory(src/MagneticField)
 add_subdirectory(src/Material)

Plugins/Digitization/include/Acts/Plugins/Digitization/CartesianSegmentation.hpp → Core/include/Acts/Digitization/CartesianSegmentation.hpp

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Plugins/Digitization/DigitizationCell.hpp"
-#include "Acts/Plugins/Digitization/Segmentation.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
 #include "Acts/Surfaces/PlanarBounds.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"
 #include "Acts/Utilities/BinUtility.hpp"

Plugins/Digitization/include/Acts/Plugins/Digitization/DigitizationModule.hpp → Core/include/Acts/Digitization/DigitizationModule.hpp

@@ -7,9 +7,9 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #pragma once
+#include "Acts//Digitization/DigitizationCell.hpp"
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Plugins/Digitization/DigitizationCell.hpp"
-#include "Acts/Plugins/Digitization/Segmentation.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
 
 #include <memory>
 

Plugins/Digitization/include/Acts/Plugins/Digitization/DoubleHitSpacePointBuilder.hpp → Core/include/Acts/Digitization/DoubleHitSpacePointBuilder.hpp

@@ -9,9 +9,9 @@
 #pragma once
 
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/SpacePointBuilder.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Plugins/Digitization/CartesianSegmentation.hpp"
-#include "Acts/Plugins/Digitization/SpacePointBuilder.hpp"
 
 namespace Acts {
 
@@ -106,4 +106,4 @@ class SpacePointBuilder<SpacePoint<Cluster>> {
                                           const Cluster& cluster) const;
 };
 }  // namespace Acts
-#include "Acts/Plugins/Digitization/detail/DoubleHitSpacePointBuilder.ipp"
+#include "Acts/Digitization/detail/DoubleHitSpacePointBuilder.ipp"

Plugins/Digitization/include/Acts/Plugins/Digitization/PlanarModuleCluster.hpp → Core/include/Acts/Digitization/PlanarModuleCluster.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/DigitizationSourceLink.hpp"
 #include "Acts/EventData/Measurement.hpp"
-#include "Acts/Plugins/Digitization/DigitizationCell.hpp"
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
-#include "Acts/Plugins/Digitization/DigitizationSourceLink.hpp"
 
 #include <array>
 #include <cassert>

Plugins/Digitization/include/Acts/Plugins/Digitization/PlanarModuleStepper.hpp → Core/include/Acts/Digitization/PlanarModuleStepper.hpp

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Plugins/Digitization/DigitizationCell.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
 #include <memory>

Plugins/Digitization/include/Acts/Plugins/Digitization/Segmentation.hpp → Core/include/Acts/Digitization/Segmentation.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Plugins/Digitization/DigitizationCell.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
 
 #include <memory>
 #include <vector>

Plugins/Digitization/include/Acts/Plugins/Digitization/SingleHitSpacePointBuilder.hpp → Core/include/Acts/Digitization/SingleHitSpacePointBuilder.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/SpacePointBuilder.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Plugins/Digitization/CartesianSegmentation.hpp"
-#include "Acts/Plugins/Digitization/SpacePointBuilder.hpp"
 
 namespace Acts {
 
@@ -56,4 +56,4 @@ class SpacePointBuilder<SpacePoint<Cluster>> {
                        const Cluster& cluster) const;
 };
 }  // namespace Acts
-#include "Acts/Plugins/Digitization/detail/SingleHitSpacePointBuilder.ipp"
+#include "Acts/Digitization/detail/SingleHitSpacePointBuilder.ipp"

Core/src/Digitization/CMakeLists.txt

@@ -0,0 +1,7 @@
+target_sources(
+  ActsCore
+  PRIVATE
+    CartesianSegmentation.cpp
+    DigitizationModule.cpp
+    PlanarModuleStepper.cpp
+)

Plugins/Digitization/src/CartesianSegmentation.cpp → Core/src/Digitization/CartesianSegmentation.cpp

@@ -10,7 +10,7 @@
 // CartesianSegmentation.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
-#include "Acts/Plugins/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
 
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"

Plugins/Digitization/src/DigitizationModule.cpp → Core/src/Digitization/DigitizationModule.cpp

@@ -10,7 +10,7 @@
 // DigitizationModule.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
 
 #include <utility>
 

Plugins/Digitization/src/PlanarModuleStepper.cpp → Core/src/Digitization/PlanarModuleStepper.cpp

@@ -10,10 +10,10 @@
 // PlanarModuleStepper.cpp, Acts project
 ///////////////////////////////////////////////////////////////////
 
-#include "Acts/Plugins/Digitization/PlanarModuleStepper.hpp"
+#include "Acts/Digitization/PlanarModuleStepper.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 

Examples/Algorithms/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_subdirectory_if(Digitization ACTS_BUILD_PLUGIN_DIGITIZATION AND ACTS_BUILD_PLUGIN_IDENTIFICATION)
+add_subdirectory_if(Digitization ACTS_BUILD_PLUGIN_IDENTIFICATION)
 add_subdirectory_if(HepMC ACTS_BUILD_EXAMPLES_HEPMC3)
 add_subdirectory(Fatras)
 add_subdirectory_if(Geant4HepMC ACTS_BUILD_EXAMPLES_GEANT4 AND ACTS_BUILD_EXAMPLES_HEPMC3)

Examples/Algorithms/Digitization/CMakeLists.txt

@@ -12,7 +12,7 @@ target_include_directories(
 target_link_libraries(
   ActsExamplesDigitization
   PUBLIC
-    ActsCore ActsPluginDigitization ActsPluginIdentification ActsExamplesFramework)
+    ActsCore ActsPluginIdentification ActsExamplesFramework)
 target_link_libraries(ActsExamplesDigitization PRIVATE Boost::program_options)
 
 install(

Examples/Algorithms/Digitization/src/PlanarSteppingAlgorithm.cpp

@@ -10,15 +10,15 @@
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
+#include "Acts/Digitization/PlanarModuleStepper.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
 #include "Acts/EventData/Measurement.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Geometry/DetectorElementBase.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleStepper.hpp"
-#include "Acts/Plugins/Digitization/Segmentation.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"

Examples/Algorithms/Printers/ActsExamples/Printers/HitsPrinter.cpp

@@ -8,7 +8,7 @@
 
 #include "HitsPrinter.hpp"
 
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/EventData/Index.hpp"

Examples/Algorithms/Printers/CMakeLists.txt

@@ -8,7 +8,7 @@ target_include_directories(
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 target_link_libraries(
   ActsExamplesPrinters
-  PUBLIC ActsCore ActsFatras ActsPluginDigitization ActsExamplesFramework)
+  PUBLIC ActsCore ActsFatras ActsExamplesFramework)
 
 install(
   TARGETS ActsExamplesPrinters

Examples/Detectors/ContextualDetector/CMakeLists.txt

@@ -9,7 +9,7 @@ target_include_directories(
 target_link_libraries(
   ActsExamplesDetectorContextual
   PUBLIC
-    ActsCore ActsPluginIdentification ActsPluginDigitization
+    ActsCore ActsPluginIdentification
     ActsExamplesFramework ActsExamplesDetectorsCommon ActsExamplesDetectorGeneric)
 
 install(

Examples/Detectors/DD4hepDetector/CMakeLists.txt

@@ -34,7 +34,7 @@ target_include_directories(
 target_link_libraries(
   ActsExamplesDetectorDD4hep
   PUBLIC
-    ActsCore ActsPluginDigitization ActsPluginDD4hep
+    ActsCore ActsPluginDD4hep
     ActsExamplesFramework ActsExamplesDetectorsCommon
     ROOT::Geom ROOT::GenVector)
 

Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetectorHelper.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
 
 #include "DD4hep/Segmentations.h"
 

Examples/Detectors/DD4hepDetector/src/DD4hepDetectorHelper.cpp

@@ -9,7 +9,7 @@
 #include "ActsExamples/DD4hepDetector/DD4hepDetectorHelper.hpp"
 
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Plugins/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"
 #include "Acts/Surfaces/TrapezoidBounds.hpp"
 

Examples/Detectors/DD4hepDetector/src/DetUtils.h

@@ -1,8 +1,8 @@
 #pragma once
 
 // DD4hep
-#include "Acts/Plugins/Digitization/CartesianSegmentation.hpp"
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/Detector.h"
 #include "DD4hep/Objects.h"

Examples/Detectors/GenericDetector/CMakeLists.txt

@@ -8,7 +8,7 @@ target_include_directories(
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
 target_link_libraries(
   ActsExamplesDetectorGeneric
-  PUBLIC ActsCore ActsPluginIdentification ActsPluginDigitization)
+  PUBLIC ActsCore ActsPluginIdentification)
 target_link_libraries(
   ActsExamplesDetectorGeneric
   PUBLIC ActsExamplesFramework ActsExamplesDetectorsCommon)

Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/ProtoLayerCreatorT.hpp

@@ -9,13 +9,13 @@
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
 #include "Acts/Geometry/ApproachDescriptor.hpp"
 #include "Acts/Geometry/DetectorElementBase.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/ProtoLayer.hpp"
 #include "Acts/Material/ISurfaceMaterial.hpp"
-#include "Acts/Plugins/Digitization/CartesianSegmentation.hpp"
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
 #include "Acts/Surfaces/PlanarBounds.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/RadialBounds.hpp"

Examples/Detectors/TGeoDetector/CMakeLists.txt

@@ -9,7 +9,7 @@ target_include_directories(
 target_link_libraries(
   ActsExamplesDetectorTGeo
   PUBLIC
-    ActsCore ActsPluginIdentification ActsPluginDigitization ActsPluginTGeo ActsPluginJson
+    ActsCore ActsPluginIdentification ActsPluginTGeo ActsPluginJson
     ActsExamplesFramework ActsExamplesDetectorsCommon
     ActsExamplesDetectorGeneric)
 

Examples/Io/Csv/CMakeLists.txt

@@ -20,7 +20,7 @@ target_include_directories(
 target_link_libraries(
   ActsExamplesIoCsv
   PRIVATE
-    ActsCore ActsPluginDigitization ActsPluginIdentification
+    ActsCore ActsPluginIdentification
     ActsExamplesFramework ActsExamplesDigitization
     Threads::Threads Boost::program_options dfelibs)
 

Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvPlanarClusterWriter.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/Framework/WriterT.hpp"
 

Examples/Io/Csv/src/CsvMeasurementReader.cpp

@@ -9,7 +9,7 @@
 #include "ActsExamples/Io/Csv/CsvMeasurementReader.hpp"
 
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "ActsExamples/Digitization/MeasurementCreation.hpp"

Examples/Io/Csv/src/CsvPlanarClusterReader.cpp

@@ -9,7 +9,7 @@
 #include "ActsExamples/Io/Csv/CsvPlanarClusterReader.hpp"
 
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"

Examples/Io/Csv/src/CsvPlanarClusterWriter.cpp

@@ -9,7 +9,7 @@
 #include "ActsExamples/Io/Csv/CsvPlanarClusterWriter.hpp"
 
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"

Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp

@@ -9,11 +9,11 @@
 #include "ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp"
 
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
 #include "Acts/Geometry/BoundarySurfaceT.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
 #include "Acts/Geometry/VolumeBounds.hpp"
-#include "Acts/Plugins/Digitization/CartesianSegmentation.hpp"
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "ActsExamples/Utilities/Paths.hpp"

Examples/Io/Root/CMakeLists.txt

@@ -23,7 +23,7 @@ target_include_directories(
 target_link_libraries(
   ActsExamplesIoRoot
   PUBLIC
-    ActsCore ActsPluginDigitization ActsPluginIdentification ActsExamplesDigitization
+    ActsCore ActsPluginIdentification ActsExamplesDigitization
     ActsExamplesFramework ActsExamplesPropagation ActsExamplesTruthTracking ActsExamplesMaterialMapping
     Threads::Threads
   PRIVATE ROOT::Core ROOT::Hist ROOT::Tree)

Examples/Io/Root/include/ActsExamples/Io/Root/RootPlanarClusterWriter.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/Framework/WriterT.hpp"
 

Examples/Io/Root/src/RootPlanarClusterWriter.cpp

@@ -9,10 +9,10 @@
 #include "ActsExamples/Io/Root/RootPlanarClusterWriter.hpp"
 
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
-#include "Acts/Plugins/Digitization/DigitizationSourceLink.hpp"
-#include "Acts/Plugins/Digitization/PlanarModuleCluster.hpp"
-#include "Acts/Plugins/Digitization/Segmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/DigitizationSourceLink.hpp"
+#include "Acts/Digitization/PlanarModuleCluster.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "ActsExamples/EventData/SimHit.hpp"

Examples/Python/CMakeLists.txt

@@ -83,7 +83,7 @@ else()
   target_sources(ActsPythonBindings PRIVATE src/Pythia8Stub.cpp)
 endif()
 
-if(ACTS_BUILD_PLUGIN_DIGITIZATION AND ACTS_BUILD_PLUGIN_IDENTIFICATION)
+if(ACTS_BUILD_PLUGIN_IDENTIFICATION)
   target_link_libraries(ActsPythonBindings PUBLIC ActsExamplesDigitization)
   target_sources(ActsPythonBindings PRIVATE src/Digitization.cpp)
 else()