Skip to content

Commit 32a451c

Browse files
authored
Merge pull request #2 from njacazio/nj-pb-acts
Rework ACTS location
2 parents afad806 + a732c9f commit 32a451c

23 files changed

Lines changed: 326 additions & 1510 deletions

‎Detectors/ACTS/CMakeLists.txt‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Detectors/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ endif()
6464

6565
o2_data_file(COPY Geometry DESTINATION Detectors)
6666

67-
add_subdirectory(ACTS)
68-
6967
if(ENABLE_UPGRADES)
7068
add_subdirectory(Upgrades)
7169
else()

‎Detectors/Upgrades/ALICE3/ACTS/CMakeLists.txt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@ if(NOT Acts_FOUND)
1515
return()
1616
endif()
1717

18-
o2_add_library(ALICE3ACTS
19-
SOURCES src/Gen3BlueprintBuilder.cxx
20-
src/Gen3GeometryConfig.cxx
21-
PUBLIC_LINK_LIBRARIES O2::ACTSInterface
22-
nlohmann_json::nlohmann_json)
2318

19+
add_subdirectory(interface)
2420
add_subdirectory(macros)
21+
add_subdirectory(workflow)
2522

26-
# Geometry description consumed at runtime by Gen3BlueprintBuilder. Installed to
27-
# $O2_ROOT/share/Detectors/Upgrades/ALICE3/ACTS/config/
28-
o2_data_file(COPY config DESTINATION Detectors/Upgrades/ALICE3/ACTS)
File renamed without changes.

‎Detectors/Upgrades/ALICE3/ACTS/config/gen3_geometry_config.json‎

Lines changed: 0 additions & 146 deletions
This file was deleted.

‎Detectors/Upgrades/ALICE3/ACTS/include/ALICE3ACTS/Gen3BlueprintBuilder.h‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎Detectors/Upgrades/ALICE3/ACTS/include/ALICE3ACTS/Gen3GeometryConfig.h‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)