Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Group all ROOT writers together #3746

Merged
merged 2 commits into from
Oct 18, 2024
Merged

refactor: Group all ROOT writers together #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32ba8f1
refactor: Group all ROOT writers together
andiwand Oct 17, 2024
4463c32
Merge branch 'main' into ex-group-root-writers
kodiakhq[bot] Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Examples/Io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
20 changes: 0 additions & 20 deletions Examples/Io/NuclearInteractions/CMakeLists.txt
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions Examples/Io/Root/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...s/Io/Performance/CKFPerformanceWriter.hpp → ...Examples/Io/Root/CKFPerformanceWriter.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ootNuclearInteractionParametersWriter.hpp → ...ootNuclearInteractionParametersWriter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 .../Performance/SeedingPerformanceWriter.hpp → ...ples/Io/Root/SeedingPerformanceWriter.hpp
View file
Open in desktop
File renamed without changes.
0 ...formance/TrackFinderPerformanceWriter.hpp → .../Io/Root/TrackFinderPerformanceWriter.hpp
View file
Open in desktop
File renamed without changes.
0 ...formance/TrackFitterPerformanceWriter.hpp → .../Io/Root/TrackFitterPerformanceWriter.hpp
View file
Open in desktop
File renamed without changes.
0 ...o/Performance/VertexPerformanceWriter.hpp → ...mples/Io/Root/VertexPerformanceWriter.hpp
View file
Open in desktop
File renamed without changes.
0 ...ail/NuclearInteractionParametrisation.hpp → ...ail/NuclearInteractionParametrisation.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/Io/Performance/CKFPerformanceWriter.cpp → ...ples/Io/Root/src/CKFPerformanceWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...ootNuclearInteractionParametersWriter.cpp → ...ootNuclearInteractionParametersWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .../Performance/SeedingPerformanceWriter.cpp → .../Io/Root/src/SeedingPerformanceWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...formance/TrackFinderPerformanceWriter.cpp → ...Root/src/TrackFinderPerformanceWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...formance/TrackFitterPerformanceWriter.cpp → ...Root/src/TrackFitterPerformanceWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...o/Performance/VertexPerformanceWriter.cpp → ...s/Io/Root/src/VertexPerformanceWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...ail/NuclearInteractionParametrisation.cpp → ...ail/NuclearInteractionParametrisation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions Examples/Python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ target_link_libraries(
ActsExamplesDetectorTGeo
ActsExamplesMagneticField
ActsExamplesIoRoot
ActsExamplesIoNuclearInteractions
ActsExamplesIoCsv
ActsExamplesIoObj
ActsExamplesIoJson
ActsExamplesIoPerformance
ActsExamplesGenerators
ActsExamplesPrinters
ActsExamplesTrackFinding
Expand Down
12 changes: 6 additions & 6 deletions Examples/Python/src/Output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Loading