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.

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

QC-604 removed analysis integration except of QCDB upload #2403

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

include(CMakeParseArguments)
include(GNUInstallDirs)
include(AddQCWorkflow)

# ---- Project ----

Expand Down
20 changes: 0 additions & 20 deletions Modules/Example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ add_library(O2QcExample
src/BenchmarkTask.cxx
src/EveryObject.cxx
src/ExampleTask.cxx
src/AnalysisTask.cxx
src/FakeCheck.cxx
src/ExampleCondition.cxx
src/CustomTH2F.cxx
Expand All @@ -21,7 +20,6 @@ target_link_libraries(O2QcExample PUBLIC O2QualityControl)
add_root_dictionary(O2QcExample
HEADERS include/Example/BenchmarkTask.h
include/Example/EveryObject.h
include/Example/AnalysisTask.h
include/Example/ExampleTask.h
include/Example/FakeCheck.h
include/Example/ExampleCondition.h
Expand All @@ -36,24 +34,6 @@ install(TARGETS O2QcExample
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/Example
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/QualityControl")

# ---- Workflows for analysis ----

# This is disabled because it can create problems when building on an FLP. This is due to the fact that we use the install directory before the install stage.

# Install the config files for the analysis.
# The command "install" cannot be used because it would be executed after o2_add_qc_workflow which relies on
# the config files being already installed in the right place.
# Note: There is an issue with ninja when a "configured" file is deleted. https://gitlab.kitware.com/cmake/cmake/-/issues/18985
# The set_property should fix it.
#configure_file("etc/analysisDirect.json" "${CMAKE_INSTALL_PREFIX}/etc/analysisDirect.json")
#set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_INSTALL_PREFIX}/etc/analysisDirect.json")
#configure_file("etc/analysisDerived.json" "${CMAKE_INSTALL_PREFIX}/etc/analysisDerived.json")
#set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_INSTALL_PREFIX}/etc/analysisDerived.json")
#
## We cannot point to the json files in the source dir because the path will be reused in the produced json.
#o2_add_qc_workflow(WORKFLOW_NAME o2-qc-example-analysis-direct CONFIG_FILE_PATH ${CMAKE_INSTALL_PREFIX}/etc/analysisDirect.json)
#o2_add_qc_workflow(WORKFLOW_NAME o2-qc-example-analysis-derived CONFIG_FILE_PATH ${CMAKE_INSTALL_PREFIX}/etc/analysisDerived.json)

# ---- Tests ----

set(TEST_SRCS test/testFactory.cxx test/testQcExample.cxx)
Expand Down
54 changes: 0 additions & 54 deletions Modules/Example/etc/analysisDerived.json

This file was deleted.

54 changes: 0 additions & 54 deletions Modules/Example/etc/analysisDirect.json

This file was deleted.

54 changes: 0 additions & 54 deletions Modules/Example/include/Example/AnalysisTask.h

This file was deleted.

1 change: 0 additions & 1 deletion Modules/Example/include/Example/LinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
#pragma link C++ class o2::quality_control_modules::example::BenchmarkTask + ;
#pragma link C++ class o2::quality_control_modules::example::ExampleCondition + ;
#pragma link C++ class o2::quality_control_modules::example::CustomTH2F + ;
#pragma link C++ class o2::quality_control_modules::example::AnalysisTask + ;
#pragma link C++ class o2::quality_control_modules::example::EveryObject+;
#endif
Loading
Loading