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

Disable event builder #1414

Merged
merged 2 commits into from
Jun 30, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ file an issue, so that we can see how to handle this.
* Proof was deprecated by ROOT
* The affected code in FairRoot is disabled by default now
* It can still be enabled with `-DBUILD_PROOF_SUPPORT=ON`.
* Deprecated FairEventBuilder and FairEventBuilderManager
* The functionality, introduced to enable event reconstruction, is not used.
* It can be enabled with `-DBUILD_EVENT_BUILDER=ON`.

### Other Notable Changes
* Consider calling `fairroot_check_root_cxxstd_compatibility()`
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ ENDIF(NOT UNIX)
option(BUILD_UNITTESTS "Build all unittests and add them as new tests" OFF)
option(ENABLE_GEANT3_TESTING "Enable tests utilizing Geant3" OFF)
option(BUILD_PROOF_SUPPORT "Support ROOT::Proof (deprecated)" OFF)
option(BUILD_EVENT_BUILDER "Build FairEventBuild" OFF)

option(BUILD_ONLINE "Build the online library" ON)
option(BUILD_MBS "Build MBS" OFF)
Expand Down
5 changes: 4 additions & 1 deletion FairRoot_build_test.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
################################################################################
# Copyright (C) 2021-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
# Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
# #
# This software is distributed under the terms of the #
# GNU Lesser General Public Licence (LGPL) version 3, #
Expand Down Expand Up @@ -50,6 +50,9 @@ endif()
if ((NOT DEFINED BUILD_PROOF_SUPPORT) OR BUILD_PROOF_SUPPORT)
list(APPEND options "-DBUILD_PROOF_SUPPORT=ON")
endif()
if ((NOT DEFINED BUILD_EVENT_BUILDER) OR BUILD_EVENT_BUILDER)
list(APPEND options "-DBUILD_EVENT_BUILDER=ON")
endif()
if (USE_CLANG_TIDY)
list(APPEND options "-DCMAKE_CXX_CLANG_TIDY=clang-tidy")
endif()
Expand Down
13 changes: 11 additions & 2 deletions fairroot/base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
set(target Base)

set(sources
event/FairEventBuilder.cxx
event/FairEventBuilderManager.cxx
event/FairEventHeader.cxx
event/FairFileHeader.cxx
event/FairFileInfo.cxx
Expand Down Expand Up @@ -80,6 +78,13 @@ if(BUILD_PROOF_SUPPORT)
)
endif()

if(BUILD_EVENT_BUILDER)
list(APPEND sources
event/FairEventBuilder.cxx
event/FairEventBuilderManager.cxx
)
endif()
ChristianTackeGSI marked this conversation as resolved.
Show resolved Hide resolved

fair_change_extensions_if_exists(.cxx .h FILES "${sources}" OUTVAR headers)

add_library(${target} SHARED ${sources} ${headers})
Expand Down Expand Up @@ -129,6 +134,10 @@ if(BUILD_PROOF_SUPPORT)
target_compile_definitions(${target} PRIVATE BUILD_PROOF_SUPPORT)
endif()

if(BUILD_EVENT_BUILDER)
target_compile_definitions(${target} PRIVATE BUILD_EVENT_BUILDER)
endif()

fairroot_target_root_dictionary(${target}
HEADERS ${headers}
LINKDEF LinkDef.h
Expand Down
8 changes: 5 additions & 3 deletions fairroot/base/LinkDef.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*************************************************************************************
* Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
Expand All @@ -16,8 +16,6 @@
#pragma link C++ class FairGeoParSet;
#pragma link C++ class FairDetector+;
//#pragma link C++ class FairDoubleHit+;
#pragma link C++ class FairEventBuilder+;
#pragma link C++ class FairEventBuilderManager+;
#pragma link C++ class FairEventHeader+;
#pragma link C++ class FairFileHeader+;
#pragma link C++ class FairGeaneApplication+;
Expand Down Expand Up @@ -79,5 +77,9 @@
#pragma link C++ class FairAnaSelector+;
#pragma link C++ class FairRunAnaProof;
#endif
#ifdef BUILD_EVENT_BUILDER
#pragma link C++ class FairEventBuilder+;
#pragma link C++ class FairEventBuilderManager+;
#endif

#endif
3 changes: 2 additions & 1 deletion fairroot/base/steer/FairRunAna.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class FairRunAna : public FairRun
/**Run for the given single entry*/
void Run(Long64_t entry);
/**Run event reconstruction from event number NStart to event number NStop */
void RunEventReco(Int_t NStart, Int_t NStop);
/** \deprecated Deprecated along with FairEventBuilder. */
[[deprecated("Deprecated along with FairEventBuilder.")]] void RunEventReco(Int_t NStart, Int_t NStop);
/**Run over all TSBuffers until the data is processed*/
void RunTSBuffers();
/** the dummy run does not check the evt header or the parameters!! */
Expand Down