Skip to content

Commit eec4e5e

Browse files
authored
The MCHMappingFactory library will disappear in O2 (#372)
* The MCHMappingFactory library will disappear in O2 This commit lets the MCH QC Module handle gracefully that removal.
1 parent c5ac167 commit eec4e5e

4 files changed

Lines changed: 12 additions & 9 deletions

File tree

Modules/MUON/MCH/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ target_include_directories(
2828
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
2929
)
3030

31-
#target_link_libraries(${MODULE_NAME} PUBLIC QualityControl)
32-
target_link_libraries(${MODULE_NAME} PUBLIC QualityControl O2::CommonDataFormat O2::GPUCommon O2::MCHMappingFactory O2::MCHMappingImpl3 O2::MCHMappingSegContour)
31+
target_link_libraries(${MODULE_NAME} PUBLIC QualityControl O2::CommonDataFormat O2::GPUCommon
32+
$<TARGET_NAME_IF_EXISTS:O2::MCHMappingFactory> O2::MCHMappingImpl3 O2::MCHMappingSegContour)
33+
34+
target_compile_definitions(${MODULE_NAME} PRIVATE $<$<TARGET_EXISTS:O2::MCHMappingFactory>:MCH_HAS_MAPPING_FACTORY>)
3335

3436
install(
3537
TARGETS ${MODULE_NAME}
@@ -40,17 +42,14 @@ install(
4042

4143
# ---- ROOT dictionary ----
4244

43-
#generate_root_dict(MODULE_NAME ${MODULE_NAME} LINKDEF "include/MCH/LinkDef.h" DICT_CLASS "${MODULE_NAME}Dict")
44-
4545
add_root_dictionary(${MODULE_NAME}
4646
HEADERS include/MCH/Mapping.h
4747
include/MCH/Decoding.h
4848
include/MCH/PedestalsTask.h
4949
include/MCH/PhysicsTask.h
5050
include/MCH/PedestalsCheck.h
5151
include/MCH/sampa_header.h
52-
LINKDEF include/MCH/LinkDef.h
53-
BASENAME ${MODULE_NAME})
52+
LINKDEF include/MCH/LinkDef.h)
5453

5554
# ---- Tests ----
5655

Modules/MUON/MCH/include/MCH/PedestalsTask.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "QualityControl/TaskInterface.h"
1010
#include "MCH/Mapping.h"
11-
#include "MCHMappingFactory/CreateSegmentation.h"
1211
#include "MCH/Decoding.h"
1312
#include "MCHBase/Digit.h"
1413

Modules/MUON/MCH/src/Mapping.cxx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55

66
#include "QualityControl/QcInfoLogger.h"
77
#include "MCH/Mapping.h"
8-
//#include "MCHMappingInterface/Segmentation.h"
8+
#ifdef MCH_HAS_MAPPING_FACTORY
99
#include "MCHMappingFactory/CreateSegmentation.h"
10+
#else
11+
#include "MCHMappingInterface/Segmentation.h"
12+
#endif
1013

1114
using namespace std;
1215

Modules/MUON/MCH/src/PedestalsTask.cxx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
#include "MCHMappingInterface/Segmentation.h"
2020
#include "MCHMappingInterface/CathodeSegmentation.h"
2121
#include "MCHRawElecMap/Mapper.h"
22-
22+
#ifdef MCH_HAS_MAPPING_FACTORY
23+
#include "MCHMappingFactory/CreateSegmentation.h"
24+
#endif
2325
//#define QC_MCH_SAVE_TEMP_ROOTFILE
2426

2527
using namespace std;

0 commit comments

Comments
 (0)