Skip to content

[MCH] [MRRTF-108] Prepare for digit move #647

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

Merged
Barthelemy merged 2 commits into from
Mar 22, 2021
Merged

[MCH] [MRRTF-108] Prepare for digit move #647

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
113202e
-
aphecetche Mar 8, 2021
6aad19c
[MCH] Preparation for Digit.h move in O2
aphecetche Mar 21, 2021
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
Empty file added Modules/Example/README.md
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions Modules/MUON/MCH/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
set(MODULE_NAME "O2QcMuonChambers")


# ---- Files ----

set(SRCS
Expand Down Expand Up @@ -37,6 +38,18 @@ target_link_libraries(${MODULE_NAME} PUBLIC O2QualityControl O2::CommonDataForma

target_compile_definitions(${MODULE_NAME} PRIVATE $<$<TARGET_EXISTS:O2::MCHMappingFactory>:MCH_HAS_MAPPING_FACTORY>)

# Digit.h is moving from MCHBase to DataFormatsMCH : let's handle both
# gracefully for the moment...
get_target_property(O2_INCLUDE_DIRS O2::CommonDataFormat INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(ROOT_INCLUDE_DIRS ROOT::Core INTERFACE_INCLUDE_DIRECTORIES)

set(CMAKE_REQUIRED_INCLUDES ${O2_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
check_include_file_cxx("DataFormatsMCH/Digit.h" HAVE_DIGIT_IN_DATAFORMATS)

if(HAVE_DIGIT_IN_DATAFORMATS)
target_compile_definitions(${MODULE_NAME} PRIVATE HAVE_DIGIT_IN_DATAFORMATS)
endif()

install(
TARGETS ${MODULE_NAME}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
Expand Down
4 changes: 4 additions & 0 deletions Modules/MUON/MCH/include/MCH/PhysicsTaskDigits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

#include "QualityControl/TaskInterface.h"
#include "MCHRawElecMap/Mapper.h"
#ifdef HAVE_DIGIT_IN_DATAFORMATS
#include "DataFormatsMCH/Digit.h"
#else
#include "MCHBase/Digit.h"
#endif
#include "MCH/GlobalHistogram.h"

class TH1F;
Expand Down
4 changes: 4 additions & 0 deletions Modules/MUON/MCH/include/MCH/PhysicsTaskPreclusters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
#include <TH2.h>
#include "QualityControl/TaskInterface.h"
#include "MCH/GlobalHistogram.h"
#if HAVE_DIGIT_IN_DATAFORMATS
#include "DataFormatsMCH/Digit.h"
#else
#include "MCHBase/Digit.h"
#endif
#include "MCHBase/PreCluster.h"

namespace o2
Expand Down