Skip to content

Commit 5fd3904

Browse files
authored
Removing mechanism for dedicated case-studies packages (#500)
* Removing mechanism for dedicated case-studies packages * Clean tests * Make pin and build naming more clear
1 parent 974ec8b commit 5fd3904

34 files changed

Lines changed: 17 additions & 727 deletions

CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ set_property(CACHE WITH_DD4HEP PROPERTY STRINGS AUTO ON OFF)
2525
set(WITH_ONNX AUTO CACHE STRING "Build analyzers that need ONNXRuntime")
2626
set_property(CACHE WITH_ONNX PROPERTY STRINGS AUTO ON OFF)
2727

28-
option(FCCANALYSES_CASESTUDIES "Build the case studies" OFF)
29-
3028
option(USE_EXTERNAL_CATCH2 "Link against an external Catch2 v3 static library, otherwise build it locally" ON)
3129

3230
option(FCCANALYSES_DOCUMENTATION "Whether or not to create doxygen doc target." ON)
@@ -136,8 +134,7 @@ if(WITH_ONNX AND BUILD_TESTING) # currently these files are only needed by ONNX-
136134
endif()
137135
endif()
138136

139-
#--- add CMake infrastructure --------------------------------------------------
140-
include(cmake/FCCAnalysesCreateConfig.cmake)
137+
#--- add CMake infrastructure -------------------------------------------------
141138
include(cmake/FCCAnalysesFunctions.cmake)
142139

143140
file(COPY bin/fccanalysis
@@ -156,7 +153,6 @@ install(FILES ${_man_files_1} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
156153
file(GLOB _man_files_7 man/man7/*.7)
157154
install(FILES ${_man_files_7} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man7)
158155

159-
160156
install(DIRECTORY examples DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples)
161157

162158
#--- Descend into subdirectories ----------------------------------------------
@@ -165,14 +161,8 @@ set(ADDONS_LIBRARIES CACHE STRING "List of external libraries the RDF utilities
165161
add_subdirectory(addons)
166162
add_subdirectory(analyzers/dataframe)
167163

168-
add_subdirectory(case-studies)
169-
if(FCCANALYSES_CASESTUDIES)
170-
add_subdirectory(analyzers/dataframe/case-studies FCCANALYSES_CASESTUDIES)
171-
endif()
172-
173-
174164
if(FCCANALYSES_DOCUMENTATION)
175-
include(cmake/FCCANALYSESDoxygen.cmake)
165+
include(cmake/FCCAnalysesDoxygen.cmake)
176166
endif()
177167

178168
if(BUILD_TESTING)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2025 CERN
189+
Copyright 2026 CERN
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

analyzers/dataframe/case-studies/CMakeLists.txt

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

analyzers/dataframe/case-studies/include/case-studies/CSTemplate.h

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

analyzers/dataframe/case-studies/include/case-studies/LinkDef.h

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

analyzers/dataframe/case-studies/include/case-studies/dummyLoaderCS.h

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

analyzers/dataframe/case-studies/src/CSTemplate.cc

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

analyzers/dataframe/case-studies/src/dummyLoaderCS.cc

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

bin/fccanalysis

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ import logging
88
import sys
99

1010
from parsers import setup_subparsers
11-
from init_analysis import init_analysis
12-
from build_analysis import build_analysis
11+
from build_fccanalyses import build_fccanalyses
1312
from test_fccanalyses import test_fccanalyses
14-
from pin_analysis import PinAnalysis
13+
from pin_fccanalyses import PinFCCAnalyses
1514
from submit import submit_analysis
1615
from run_analysis import run
1716
from run_final_analysis import run_final
@@ -112,14 +111,12 @@ def main():
112111
logger.addHandler(stdout_stream_handler)
113112
logger.addHandler(stderr_stream_handler)
114113

115-
if args.command == 'init':
116-
init_analysis(parser)
117-
elif args.command == 'build':
118-
build_analysis(parser)
114+
if args.command == 'build':
115+
build_fccanalyses(parser)
119116
elif args.command == 'test':
120117
test_fccanalyses(parser)
121118
elif args.command == 'pin':
122-
PinAnalysis(parser)
119+
PinFCCAnalyses(parser)
123120
elif args.command == 'submit':
124121
submit_analysis(parser)
125122
elif args.command == 'final':

case-studies/CMakeLists.txt

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

0 commit comments

Comments
 (0)