Skip to content

The MCHMappingFactory library will disappear in O2 #372

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
Apr 20, 2020
Merged

The MCHMappingFactory library will disappear in O2 #372

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
e5ba51a
The MCHMappingFactory library will disappear in O2
aphecetche Apr 17, 2020
dd1f9b9
clang-format
aphecetche Apr 17, 2020
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
11 changes: 5 additions & 6 deletions Modules/MUON/MCH/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ target_include_directories(
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
)

#target_link_libraries(${MODULE_NAME} PUBLIC QualityControl)
target_link_libraries(${MODULE_NAME} PUBLIC QualityControl O2::CommonDataFormat O2::GPUCommon O2::MCHMappingFactory O2::MCHMappingImpl3 O2::MCHMappingSegContour)
target_link_libraries(${MODULE_NAME} PUBLIC QualityControl O2::CommonDataFormat O2::GPUCommon
$<TARGET_NAME_IF_EXISTS:O2::MCHMappingFactory> O2::MCHMappingImpl3 O2::MCHMappingSegContour)

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

install(
TARGETS ${MODULE_NAME}
Expand All @@ -40,17 +42,14 @@ install(

# ---- ROOT dictionary ----

#generate_root_dict(MODULE_NAME ${MODULE_NAME} LINKDEF "include/MCH/LinkDef.h" DICT_CLASS "${MODULE_NAME}Dict")

add_root_dictionary(${MODULE_NAME}
HEADERS include/MCH/Mapping.h
include/MCH/Decoding.h
include/MCH/PedestalsTask.h
include/MCH/PhysicsTask.h
include/MCH/PedestalsCheck.h
include/MCH/sampa_header.h
LINKDEF include/MCH/LinkDef.h
BASENAME ${MODULE_NAME})
LINKDEF include/MCH/LinkDef.h)

# ---- Tests ----

Expand Down
1 change: 0 additions & 1 deletion Modules/MUON/MCH/include/MCH/PedestalsTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "QualityControl/TaskInterface.h"
#include "MCH/Mapping.h"
#include "MCHMappingFactory/CreateSegmentation.h"
#include "MCH/Decoding.h"
#include "MCHBase/Digit.h"

Expand Down
5 changes: 4 additions & 1 deletion Modules/MUON/MCH/src/Mapping.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@

#include "QualityControl/QcInfoLogger.h"
#include "MCH/Mapping.h"
//#include "MCHMappingInterface/Segmentation.h"
#ifdef MCH_HAS_MAPPING_FACTORY
#include "MCHMappingFactory/CreateSegmentation.h"
#else
#include "MCHMappingInterface/Segmentation.h"
#endif

using namespace std;

Expand Down
4 changes: 3 additions & 1 deletion Modules/MUON/MCH/src/PedestalsTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
#include "MCHMappingInterface/Segmentation.h"
#include "MCHMappingInterface/CathodeSegmentation.h"
#include "MCHRawElecMap/Mapper.h"

#ifdef MCH_HAS_MAPPING_FACTORY
#include "MCHMappingFactory/CreateSegmentation.h"
#endif
//#define QC_MCH_SAVE_TEMP_ROOTFILE

using namespace std;
Expand Down