From c38283a64b4ba6f94387c6724792bf5d23a5baaa Mon Sep 17 00:00:00 2001 From: chkouzin Date: Mon, 22 Aug 2016 10:08:21 +0200 Subject: [PATCH] Use set(LIBRARY_NAME ${MODULE_NAME}) Changed TPCsimulation -> TPCSimulation Changed TPCbase -> TPCBase Changed itsBase -> ITSBase Renamed itsSimulation -> ITSSimulation Renamed Bucket -> bucket for consistency Removed unnecessary itsmft/ and o2cdb/ directories --- CCDB/CMakeLists-2.txt | 130 ------------------ CCDB/CMakeLists.txt | 10 +- Common/Field/CMakeLists.txt | 2 +- Common/MathUtils/CMakeLists.txt | 2 +- Detectors/Base/CMakeLists.txt | 2 +- Detectors/ITSMFT/ITS/CMakeLists.txt | 1 - Detectors/ITSMFT/ITS/base/CMakeLists.txt | 6 +- .../{itsBase => ITSBase}/ContainerFactory.h | 0 .../MisalignmentParameter.h | 0 .../ITSMFT/ITS/base/src/ContainerFactory.cxx | 2 +- .../{itsBaseLinkDef.h => ITSBaseLinkDef.h} | 0 .../ITS/base/src/MisalignmentParameter.cxx | 2 +- .../ITSMFT/ITS/reconstruction/CMakeLists.txt | 38 ----- .../ITSMFT/ITS/simulation/CMakeLists.txt | 6 +- .../{itsSimulation => ITSSimulation}/Chip.h | 0 .../Detector.h | 0 .../{itsSimulation => ITSSimulation}/Digit.h | 0 .../DigitContainer.h | 0 .../DigitLayer.h | 0 .../DigitStave.h | 0 .../DigitWriteoutBuffer.h | 2 +- .../Digitizer.h | 2 +- .../DigitizerTask.h | 0 .../GeometryHandler.h | 0 .../GeometryManager.h | 0 .../{itsSimulation => ITSSimulation}/Point.h | 0 .../README.md | 0 .../Segmentation.h | 0 .../UpgradeGeometryTGeo.h | 2 +- .../UpgradeSegmentationPixel.h | 2 +- .../UpgradeV1Layer.h | 4 +- .../V11Geometry.h | 0 Detectors/ITSMFT/ITS/simulation/src/Chip.cxx | 6 +- .../ITSMFT/ITS/simulation/src/Detector.cxx | 12 +- Detectors/ITSMFT/ITS/simulation/src/Digit.cxx | 2 +- .../ITS/simulation/src/DigitContainer.cxx | 8 +- .../ITSMFT/ITS/simulation/src/DigitLayer.cxx | 4 +- .../ITSMFT/ITS/simulation/src/DigitStave.cxx | 4 +- .../simulation/src/DigitWriteoutBuffer.cxx | 2 +- .../ITSMFT/ITS/simulation/src/Digitizer.cxx | 10 +- .../ITS/simulation/src/DigitizerTask.cxx | 6 +- .../ITS/simulation/src/GeometryHandler.cxx | 2 +- .../ITS/simulation/src/GeometryManager.cxx | 2 +- ...lationLinkDef.h => ITSSimulationLinkDef.h} | 0 Detectors/ITSMFT/ITS/simulation/src/Point.cxx | 2 +- .../ITS/simulation/src/Segmentation.cxx | 2 +- .../simulation/src/UpgradeGeometryTGeo.cxx | 8 +- .../src/UpgradeSegmentationPixel.cxx | 4 +- .../ITS/simulation/src/UpgradeV1Layer.cxx | 6 +- .../ITSMFT/ITS/simulation/src/V11Geometry.cxx | 2 +- .../ITSMFT/test/HitAnalysis/CMakeLists.txt | 6 +- .../test/HitAnalysis/src/HitAnalysis.cxx | 8 +- ...{testitsLinkDef.h => HitAnalysisLinkDef.h} | 0 Detectors/TPC/CMakeLists.txt | 1 - Detectors/TPC/base/CMakeLists.txt | 34 ++--- .../base/include/{TPCbase => TPCBase}/CRU.h | 6 +- .../{TPCbase => TPCBase}/ContainerFactory.h | 0 .../base/include/{TPCbase => TPCBase}/Defs.h | 0 .../include/{TPCbase => TPCBase}/DigitPos.h | 8 +- .../include/{TPCbase => TPCBase}/FECInfo.h | 0 .../include/{TPCbase => TPCBase}/Mapper.h | 10 +- .../include/{TPCbase => TPCBase}/PadInfo.h | 8 +- .../include/{TPCbase => TPCBase}/PadPos.h | 0 .../{TPCbase => TPCBase}/PadRegionInfo.h | 4 +- .../include/{TPCbase => TPCBase}/PadSecPos.h | 4 +- .../include/{TPCbase => TPCBase}/Point2D.h | 0 .../include/{TPCbase => TPCBase}/Point3D.h | 0 .../base/include/{TPCbase => TPCBase}/ROC.h | 4 +- .../include/{TPCbase => TPCBase}/Sector.h | 2 +- Detectors/TPC/base/src/CRU.cxx | 2 +- Detectors/TPC/base/src/ContainerFactory.cxx | 2 +- Detectors/TPC/base/src/DigitPos.cxx | 4 +- Detectors/TPC/base/src/FECInfo.cxx | 2 +- Detectors/TPC/base/src/Mapper.cxx | 2 +- Detectors/TPC/base/src/PadInfo.cxx | 2 +- Detectors/TPC/base/src/PadPos.cxx | 2 +- Detectors/TPC/base/src/PadRegionInfo.cxx | 2 +- Detectors/TPC/base/src/PadSecPos.cxx | 2 +- Detectors/TPC/base/src/Point2D.cxx | 2 +- Detectors/TPC/base/src/Point3D.cxx | 2 +- Detectors/TPC/base/src/ROC.cxx | 2 +- Detectors/TPC/base/src/Sector.cxx | 2 +- .../{tpcBaseLinkDef.h => TPCBaseLinkDef.h} | 0 Detectors/TPC/reconstruction/CMakeLists.txt | 37 ----- Detectors/TPC/simulation/CMakeLists.txt | 7 +- .../BoxCluster.h | 2 +- .../BoxClusterer.h | 0 .../Cluster.h | 0 .../ClusterCRU.h | 0 .../ClusterContainer.h | 2 +- .../ClusterRow.h | 0 .../ClustererTask.h | 0 .../Detector.h | 0 .../{TPCsimulation => TPCSimulation}/Digit.h | 0 .../DigitADC.h | 2 +- .../DigitCRU.h | 0 .../DigitContainer.h | 4 +- .../DigitPad.h | 0 .../DigitRow.h | 0 .../DigitTime.h | 0 .../Digitizer.h | 2 +- .../DigitizerTask.h | 0 .../{TPCsimulation => TPCSimulation}/Point.h | 0 Detectors/TPC/simulation/src/BoxCluster.cxx | 6 +- Detectors/TPC/simulation/src/BoxClusterer.cxx | 8 +- Detectors/TPC/simulation/src/Cluster.cxx | 2 +- Detectors/TPC/simulation/src/ClusterCRU.cxx | 4 +- .../TPC/simulation/src/ClusterContainer.cxx | 4 +- .../TPC/simulation/src/ClustererTask.cxx | 6 +- Detectors/TPC/simulation/src/Detector.cxx | 4 +- Detectors/TPC/simulation/src/Digit.cxx | 2 +- Detectors/TPC/simulation/src/DigitADC.cxx | 4 +- Detectors/TPC/simulation/src/DigitCRU.cxx | 8 +- .../TPC/simulation/src/DigitContainer.cxx | 10 +- Detectors/TPC/simulation/src/DigitPad.cxx | 6 +- Detectors/TPC/simulation/src/DigitRow.cxx | 6 +- Detectors/TPC/simulation/src/DigitTime.cxx | 8 +- Detectors/TPC/simulation/src/Digitizer.cxx | 6 +- .../TPC/simulation/src/DigitizerTask.cxx | 6 +- Detectors/TPC/simulation/src/Point.cxx | 2 +- ...lationLinkDef.h => TPCSimulationLinkDef.h} | 0 Examples/ExampleModule1/CMakeLists.txt | 4 +- Examples/ExampleModule2/CMakeLists.txt | 8 +- Examples/flp2epn-distributed/CMakeLists.txt | 12 +- Examples/flp2epn/CMakeLists.txt | 8 +- Generators/CMakeLists.txt | 4 +- ...GeneratorLinkDef.h => GeneratorsLinkDef.h} | 0 Utilities/QC/CMakeLists.txt | 89 ------------ Utilities/hough/CMakeLists.txt | 2 +- cmake/O2Dependencies.cmake | 24 ++-- cmake/O2Utils.cmake | 20 +-- docs/doxygen/CMakeInstructions.md | 8 +- itsmft/its/CMakeLists.txt | 56 -------- macro/load_all_libs.C | 7 +- o2cdb/CMakeLists.txt | 78 ----------- 135 files changed, 226 insertions(+), 660 deletions(-) delete mode 100644 CCDB/CMakeLists-2.txt rename Detectors/ITSMFT/ITS/base/include/{itsBase => ITSBase}/ContainerFactory.h (100%) rename Detectors/ITSMFT/ITS/base/include/{itsBase => ITSBase}/MisalignmentParameter.h (100%) rename Detectors/ITSMFT/ITS/base/src/{itsBaseLinkDef.h => ITSBaseLinkDef.h} (100%) delete mode 100644 Detectors/ITSMFT/ITS/reconstruction/CMakeLists.txt rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/Chip.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/Detector.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/Digit.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/DigitContainer.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/DigitLayer.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/DigitStave.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/DigitWriteoutBuffer.h (95%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/Digitizer.h (97%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/DigitizerTask.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/GeometryHandler.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/GeometryManager.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/Point.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/README.md (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/Segmentation.h (100%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/UpgradeGeometryTGeo.h (99%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/UpgradeSegmentationPixel.h (99%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/UpgradeV1Layer.h (99%) rename Detectors/ITSMFT/ITS/simulation/include/{itsSimulation => ITSSimulation}/V11Geometry.h (100%) rename Detectors/ITSMFT/ITS/simulation/src/{itsSimulationLinkDef.h => ITSSimulationLinkDef.h} (100%) rename Detectors/ITSMFT/test/HitAnalysis/src/{testitsLinkDef.h => HitAnalysisLinkDef.h} (100%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/CRU.h (95%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/ContainerFactory.h (100%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/Defs.h (100%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/DigitPos.h (90%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/FECInfo.h (100%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/Mapper.h (96%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/PadInfo.h (80%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/PadPos.h (100%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/PadRegionInfo.h (98%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/PadSecPos.h (90%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/Point2D.h (100%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/Point3D.h (100%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/ROC.h (96%) rename Detectors/TPC/base/include/{TPCbase => TPCBase}/Sector.h (98%) rename Detectors/TPC/base/src/{tpcBaseLinkDef.h => TPCBaseLinkDef.h} (100%) delete mode 100644 Detectors/TPC/reconstruction/CMakeLists.txt rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/BoxCluster.h (98%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/BoxClusterer.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/Cluster.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/ClusterCRU.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/ClusterContainer.h (97%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/ClusterRow.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/ClustererTask.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/Detector.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/Digit.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/DigitADC.h (93%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/DigitCRU.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/DigitContainer.h (91%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/DigitPad.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/DigitRow.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/DigitTime.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/Digitizer.h (96%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/DigitizerTask.h (100%) rename Detectors/TPC/simulation/include/{TPCsimulation => TPCSimulation}/Point.h (100%) rename Detectors/TPC/simulation/src/{tpcSimulationLinkDef.h => TPCSimulationLinkDef.h} (100%) rename Generators/src/{EventGeneratorLinkDef.h => GeneratorsLinkDef.h} (100%) delete mode 100644 itsmft/its/CMakeLists.txt delete mode 100644 o2cdb/CMakeLists.txt diff --git a/CCDB/CMakeLists-2.txt b/CCDB/CMakeLists-2.txt deleted file mode 100644 index b5914c82536d8..0000000000000 --- a/CCDB/CMakeLists-2.txt +++ /dev/null @@ -1,130 +0,0 @@ -O2_SETUP(NAME "CCDB" RELATIVE_INCLUDE_PATH "include" RELATIVE_SOURCE_PATH "src") - -# todo this should go but it is currently needed to generate the dictionary -set(INCLUDE_DIRECTORIES - ${CMAKE_SOURCE_DIR}/CCDB/include - ${CMAKE_SOURCE_DIR}/CCDB - ) -set(SYSTEM_INCLUDE_DIRECTORIES - ${BASE_INCLUDE_DIRECTORIES} - ${Boost_INCLUDE_DIR} - ${ROOT_INCLUDE_DIR} - ${FAIRROOT_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} - ) -# -#include_directories(${INCLUDE_DIRECTORIES}) -#include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) - -#set(LINK_DIRECTORIES -# ${ROOT_LIBRARY_DIR} -# ${Boost_LIBRARY_DIRS} -# ${FAIRROOT_LIBRARY_DIR} -# ) -#link_directories(${LINK_DIRECTORIES}) - -set(SRCS - src/Manager.cxx - src/Condition.cxx - src/GridStorage.cxx - src/LocalStorage.cxx - src/FileStorage.cxx - src/ConditionMetaData.cxx - src/ConditionId.cxx - src/IdPath.cxx - src/IdRunRange.cxx - src/Storage.cxx - src/XmlHandler.cxx - ) - -set(HEADERS - include/CCDB/Condition.h - include/CCDB/ConditionId.h - include/CCDB/ConditionMetaData.h - include/CCDB/FileStorage.h - include/CCDB/GridStorage.h - include/CCDB/IdPath.h - include/CCDB/IdRunRange.h - include/CCDB/LocalStorage.h - include/CCDB/Manager.h - include/CCDB/Storage.h - include/CCDB/XmlHandler.h - ) - -set(NO_DICT_SRCS - src/ConditionsMQServer.cxx - src/ConditionsMQClient.cxx - ) - -#set(DEPENDENCIES -# Base ParBase FairMQ ParMQ ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} fairmq_logger pthread Core Tree XMLParser Hist -# ) - -set(BUCKET_NAME CCDB_Bucket) -set(LIBRARY_NAME CCDB) -set(LINKDEF src/CCDBLinkDef.h) - -message("NO_DICT_SRCS : ${NO_DICT_SRCS}") - -# Does a lot of magic : -# - generate root dictionary -# - build library -# - install -O2_GENERATE_LIBRARY( -# LIBRARY_NAME ${LIBRARY_NAME} -# BUCKET_NAME ${BUCKET_NAME} -# LINKDEF src/CCDBLinkDef.h -# SOURCES ${SRCS} -# HEADERS ${HEADERS} -# NO_DICT_SOURCES ${NO_DICT_SRCS} -# INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} -) - -Set(Exe_Names - conditions-server - conditions-client - ) - -Set(Exe_Source - src/runConditionsServer.cxx - src/runConditionsClient.cxx - ) - -list(LENGTH Exe_Names _length) -math(EXPR _length ${_length}-1) - -foreach (_file RANGE 0 ${_length}) - list(GET Exe_Names ${_file} _name) - list(GET Exe_Source ${_file} _src) - Set(EXE_NAME ${_name}) - Set(SRCS ${_src}) - Set(DEPENDENCIES CCDB) - O2_GENERATE_EXECUTABLE( - EXE_NAME ${_name} - SOURCES ${_src} - MODULE_LIBRARY_NAME ${LIBRARY_NAME} - BUCKET_NAME ${BUCKET_NAME} - ) -endforeach (_file RANGE 0 ${_length}) - -# Says how and where to install software -# Targets: -# * /lib/ -# * header location after install: /include//*.h -# * headers can be included by C++ code `#include /Foo.hpp>` -#install( -# TARGETS ${LIBRARY_NAME} ${APPLICATION_NAME} -# # EXPORT ${PROJECT_NAME}Targets # for downstream dependencies -# ARCHIVE DESTINATION lib COMPONENT libs # static lib -# RUNTIME DESTINATION bin COMPONENT libs # binaries -# LIBRARY DESTINATION lib COMPONENT libs # shared lib -# # FRAMEWORK DESTINATION bin COMPONENT libs # for mac -# PUBLIC_HEADER DESTINATION include/${LIBRARY_NAME} COMPONENT devel -# # INCLUDES DESTINATION include # headers -# ) -install( - FILES config/conditions-server.json - config/conditions-client.json - example/fill_local_ocdb.C - DESTINATION bin/config -) \ No newline at end of file diff --git a/CCDB/CMakeLists.txt b/CCDB/CMakeLists.txt index cec4d95d99936..021a9cd5ff6f8 100644 --- a/CCDB/CMakeLists.txt +++ b/CCDB/CMakeLists.txt @@ -35,9 +35,9 @@ Set(NO_DICT_SRCS src/ConditionsMQClient.cxx ) -set(LIBRARY_NAME CCDB) +set(LIBRARY_NAME ${MODULE_NAME}) set(LINKDEF src/CCDBLinkDef.h) -set(BUCKET_NAME CCDB_Bucket) +set(BUCKET_NAME CCDB_bucket) O2_GENERATE_LIBRARY() @@ -52,8 +52,8 @@ Set(Exe_Source ) # todo we repeat ourselves because the macro O2_GENERATE_LIBRARY dares deleting the variables we pass to it. -set(LIBRARY_NAME CCDB) -set(BUCKET_NAME CCDB_Bucket) +set(LIBRARY_NAME ${MODULE_NAME}) +set(BUCKET_NAME CCDB_bucket) list(LENGTH Exe_Names _length) math(EXPR _length ${_length}-1) @@ -77,4 +77,4 @@ install( config/conditions-client.json example/fill_local_ocdb.C DESTINATION bin/config -) \ No newline at end of file +) diff --git a/Common/Field/CMakeLists.txt b/Common/Field/CMakeLists.txt index e5d83aa711568..b39c6e0083ce7 100644 --- a/Common/Field/CMakeLists.txt +++ b/Common/Field/CMakeLists.txt @@ -12,7 +12,7 @@ set(HEADERS include/${MODULE_NAME}/MagneticField.h ) set(LINKDEF src/FieldLinkDef.h) -set(LIBRARY_NAME Field) +set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME common_field_bucket) O2_GENERATE_LIBRARY() diff --git a/Common/MathUtils/CMakeLists.txt b/Common/MathUtils/CMakeLists.txt index 8ddca25c5874f..916767d6f5e45 100644 --- a/Common/MathUtils/CMakeLists.txt +++ b/Common/MathUtils/CMakeLists.txt @@ -12,7 +12,7 @@ set(HEADERS include/${MODULE_NAME}/Chebyshev3DCalc.h ) set(LINKDEF src/MathUtilsLinkDef.h) -set(LIBRARY_NAME MathUtils) +set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME common_math_bucket) O2_GENERATE_LIBRARY() diff --git a/Detectors/Base/CMakeLists.txt b/Detectors/Base/CMakeLists.txt index 5ae334ed29eb4..7a40c62600998 100644 --- a/Detectors/Base/CMakeLists.txt +++ b/Detectors/Base/CMakeLists.txt @@ -12,7 +12,7 @@ Set(HEADERS include/${MODULE_NAME}/Detector.h ) Set(LINKDEF src/BaseLinkDef.h) -Set(LIBRARY_NAME ${MODULE_NAME})#AliceO2Base) +Set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME detectors_base) O2_GENERATE_LIBRARY() diff --git a/Detectors/ITSMFT/ITS/CMakeLists.txt b/Detectors/ITSMFT/ITS/CMakeLists.txt index 1763c35665f45..d986b027851dc 100644 --- a/Detectors/ITSMFT/ITS/CMakeLists.txt +++ b/Detectors/ITSMFT/ITS/CMakeLists.txt @@ -15,5 +15,4 @@ # Libraries add_subdirectory(base) -#add_subdirectory(reconstruction) add_subdirectory(simulation) diff --git a/Detectors/ITSMFT/ITS/base/CMakeLists.txt b/Detectors/ITSMFT/ITS/base/CMakeLists.txt index da2e5471c3a1e..34d6143cca70a 100644 --- a/Detectors/ITSMFT/ITS/base/CMakeLists.txt +++ b/Detectors/ITSMFT/ITS/base/CMakeLists.txt @@ -1,4 +1,4 @@ -set(MODULE_NAME "itsBase") +set(MODULE_NAME "ITSBase") O2_SETUP(NAME ${MODULE_NAME}) @@ -13,8 +13,8 @@ set(HEADERS ) -Set(LINKDEF src/itsBaseLinkDef.h) -Set(LIBRARY_NAME itsBase) +Set(LINKDEF src/ITSBaseLinkDef.h) +Set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME its_base_bucket) O2_GENERATE_LIBRARY() diff --git a/Detectors/ITSMFT/ITS/base/include/itsBase/ContainerFactory.h b/Detectors/ITSMFT/ITS/base/include/ITSBase/ContainerFactory.h similarity index 100% rename from Detectors/ITSMFT/ITS/base/include/itsBase/ContainerFactory.h rename to Detectors/ITSMFT/ITS/base/include/ITSBase/ContainerFactory.h diff --git a/Detectors/ITSMFT/ITS/base/include/itsBase/MisalignmentParameter.h b/Detectors/ITSMFT/ITS/base/include/ITSBase/MisalignmentParameter.h similarity index 100% rename from Detectors/ITSMFT/ITS/base/include/itsBase/MisalignmentParameter.h rename to Detectors/ITSMFT/ITS/base/include/ITSBase/MisalignmentParameter.h diff --git a/Detectors/ITSMFT/ITS/base/src/ContainerFactory.cxx b/Detectors/ITSMFT/ITS/base/src/ContainerFactory.cxx index 3eaacc2a93d46..ba377bf78472f 100644 --- a/Detectors/ITSMFT/ITS/base/src/ContainerFactory.cxx +++ b/Detectors/ITSMFT/ITS/base/src/ContainerFactory.cxx @@ -1,7 +1,7 @@ /// \file ContainerFactory.cxx /// \brief Implementation of the ContainerFactory class -#include "itsBase/ContainerFactory.h" +#include "ITSBase/ContainerFactory.h" #include "FairRuntimeDb.h" // for FairRuntimeDb #include "TString.h" // for TString diff --git a/Detectors/ITSMFT/ITS/base/src/itsBaseLinkDef.h b/Detectors/ITSMFT/ITS/base/src/ITSBaseLinkDef.h similarity index 100% rename from Detectors/ITSMFT/ITS/base/src/itsBaseLinkDef.h rename to Detectors/ITSMFT/ITS/base/src/ITSBaseLinkDef.h diff --git a/Detectors/ITSMFT/ITS/base/src/MisalignmentParameter.cxx b/Detectors/ITSMFT/ITS/base/src/MisalignmentParameter.cxx index e8f0802fc43ee..c84fc9c1a108d 100644 --- a/Detectors/ITSMFT/ITS/base/src/MisalignmentParameter.cxx +++ b/Detectors/ITSMFT/ITS/base/src/MisalignmentParameter.cxx @@ -1,7 +1,7 @@ /// \file MisalignmentParameter.cxx /// \brief Implementation of the MisalignmentParameter class -#include "itsBase/MisalignmentParameter.h" +#include "ITSBase/MisalignmentParameter.h" #include "FairParamList.h" diff --git a/Detectors/ITSMFT/ITS/reconstruction/CMakeLists.txt b/Detectors/ITSMFT/ITS/reconstruction/CMakeLists.txt deleted file mode 100644 index 12882dbf6d865..0000000000000 --- a/Detectors/ITSMFT/ITS/reconstruction/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -set(INCLUDE_DIRECTORIES - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/detectors/itsmft/its/reconstruction/src - ${CMAKE_SOURCE_DIR}/detectors/itsmft/its/reconstruction/include - ) - -set(SYSTEM_INCLUDE_DIRECTORIES - ${CMAKE_SOURCE_DIR} - ${BASE_INCLUDE_DIRECTORIES} - ${Boost_INCLUDE_DIRS} - ${FAIRROOT_INCLUDE_DIR} - ${ROOT_INCLUDE_DIR} - ) - -include_directories(${INCLUDE_DIRECTORIES}) -include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) - -set(LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} - ${FAIRROOT_LIBRARY_DIR} - ) - -link_directories(${LINK_DIRECTORIES}) - -set(SRCS - - ) - -set(HEADERS - - ) -Set(LINKDEF src/itsReconstructionLinkDef.h) -Set(LIBRARY_NAME its) -Set(DEPENDENCIES - AliceO2Base - ) - -GENERATE_LIBRARY() diff --git a/Detectors/ITSMFT/ITS/simulation/CMakeLists.txt b/Detectors/ITSMFT/ITS/simulation/CMakeLists.txt index 73ffeada46cb7..aa735fda6ebf2 100644 --- a/Detectors/ITSMFT/ITS/simulation/CMakeLists.txt +++ b/Detectors/ITSMFT/ITS/simulation/CMakeLists.txt @@ -1,4 +1,4 @@ -set(MODULE_NAME "itsSimulation") +set(MODULE_NAME "ITSSimulation") O2_SETUP(NAME ${MODULE_NAME}) @@ -41,8 +41,8 @@ set(HEADERS include/${MODULE_NAME}/V11Geometry.h ) -Set(LINKDEF src/itsSimulationLinkDef.h) -Set(LIBRARY_NAME itsSimulation) +Set(LINKDEF src/ITSSimulationLinkDef.h) +Set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME its_simulation_bucket) O2_GENERATE_LIBRARY() diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Chip.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Chip.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Chip.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Chip.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Detector.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Detector.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Detector.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Detector.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Digit.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Digit.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Digit.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Digit.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitContainer.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitContainer.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitContainer.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitContainer.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitLayer.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitLayer.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitLayer.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitLayer.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitStave.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitStave.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitStave.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitStave.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitWriteoutBuffer.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitWriteoutBuffer.h similarity index 95% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitWriteoutBuffer.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitWriteoutBuffer.h index 8b6eeab5c10dc..a465eec180b4e 100644 --- a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitWriteoutBuffer.h +++ b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitWriteoutBuffer.h @@ -13,7 +13,7 @@ #include // for TString #include "FairWriteoutBuffer.h" // for FairWriteoutBuffer #include "Rtypes.h" // for DigitWriteoutBuffer::Class, Bool_t, etc -#include "itsSimulation/Digit.h" // for Digit +#include "ITSSimulation/Digit.h" // for Digit namespace AliceO2 { namespace ITS { diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Digitizer.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Digitizer.h similarity index 97% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Digitizer.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Digitizer.h index 79745a6f5dec5..db171d38783ef 100644 --- a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Digitizer.h +++ b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Digitizer.h @@ -5,7 +5,7 @@ #include "Rtypes.h" // for Digitizer::Class, Double_t, ClassDef, etc #include "TObject.h" // for TObject -#include "itsSimulation/Chip.h" +#include "ITSSimulation/Chip.h" class TClonesArray; // lines 13-13 namespace AliceO2 { namespace ITS { class DigitContainer; }} // lines 19-19 diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitizerTask.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitizerTask.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/DigitizerTask.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/DigitizerTask.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/GeometryHandler.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/GeometryHandler.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/GeometryHandler.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/GeometryHandler.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/GeometryManager.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/GeometryManager.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/GeometryManager.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/GeometryManager.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Point.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Point.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Point.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Point.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/README.md b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/README.md similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/README.md rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/README.md diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Segmentation.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Segmentation.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/Segmentation.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/Segmentation.h diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeGeometryTGeo.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeGeometryTGeo.h similarity index 99% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeGeometryTGeo.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeGeometryTGeo.h index 9fd719d0be7d6..39232c118ee0c 100644 --- a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeGeometryTGeo.h +++ b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeGeometryTGeo.h @@ -11,7 +11,7 @@ #include // for TObject #include // for TString #include "Rtypes.h" // for Int_t, Double_t, Bool_t, UInt_t, etc -#include "itsSimulation/Segmentation.h" // for Segmentation +#include "ITSSimulation/Segmentation.h" // for Segmentation class TGeoPNEntry; // lines 17-17 diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeSegmentationPixel.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeSegmentationPixel.h similarity index 99% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeSegmentationPixel.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeSegmentationPixel.h index 47a8aa76cc509..26e2adb36e1d4 100644 --- a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeSegmentationPixel.h +++ b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeSegmentationPixel.h @@ -6,7 +6,7 @@ #include "FairLogger.h" // for LOG #include "Rtypes.h" // for Int_t, Float_t, Double_t, UInt_t, etc -#include "itsSimulation/Segmentation.h" // for Segmentation +#include "ITSSimulation/Segmentation.h" // for Segmentation class TObjArray; diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeV1Layer.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeV1Layer.h similarity index 99% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeV1Layer.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeV1Layer.h index f8bb31f03cb32..1b0e179fbd4b0 100644 --- a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/UpgradeV1Layer.h +++ b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/UpgradeV1Layer.h @@ -8,8 +8,8 @@ #include // for gGeoManager #include "Rtypes.h" // for Double_t, Int_t, Bool_t, etc -#include "itsSimulation/V11Geometry.h" // for V11Geometry -#include "itsSimulation/Detector.h" // for Detector, Detector::UpgradeModel +#include "ITSSimulation/V11Geometry.h" // for V11Geometry +#include "ITSSimulation/Detector.h" // for Detector, Detector::UpgradeModel class TGeoArb8; diff --git a/Detectors/ITSMFT/ITS/simulation/include/itsSimulation/V11Geometry.h b/Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/V11Geometry.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/include/itsSimulation/V11Geometry.h rename to Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/V11Geometry.h diff --git a/Detectors/ITSMFT/ITS/simulation/src/Chip.cxx b/Detectors/ITSMFT/ITS/simulation/src/Chip.cxx index e294a17a53719..29c11f69bf951 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/Chip.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/Chip.cxx @@ -6,12 +6,12 @@ // Adapted from AliITSUChip by Massimo Masera // -#include "itsSimulation/Chip.h" +#include "ITSSimulation/Chip.h" #include // for Sqrt #include // for memset #include "TObjArray.h" // for TObjArray -#include "itsSimulation/Point.h" -#include "itsSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/Point.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" ClassImp(AliceO2::ITS::Chip) diff --git a/Detectors/ITSMFT/ITS/simulation/src/Detector.cxx b/Detectors/ITSMFT/ITS/simulation/src/Detector.cxx index ffa6fc71a0868..af2e6a2e6265b 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/Detector.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/Detector.cxx @@ -1,13 +1,13 @@ /// \file Detector.cxx /// \brief Implementation of the Detector class -#include "itsSimulation/Detector.h" -#include "itsSimulation/GeometryHandler.h" -#include "itsSimulation/UpgradeGeometryTGeo.h" -#include "itsSimulation/UpgradeV1Layer.h" -#include "itsSimulation/Point.h" +#include "ITSSimulation/Detector.h" +#include "ITSSimulation/GeometryHandler.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/UpgradeV1Layer.h" +#include "ITSSimulation/Point.h" -#include "itsBase/MisalignmentParameter.h" // for MisalignmentParameter +#include "ITSBase/MisalignmentParameter.h" // for MisalignmentParameter #include "SimulationDataFormat/DetectorList.h" #include "SimulationDataFormat/Stack.h" diff --git a/Detectors/ITSMFT/ITS/simulation/src/Digit.cxx b/Detectors/ITSMFT/ITS/simulation/src/Digit.cxx index e6af668503625..d962e7f8263ff 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/Digit.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/Digit.cxx @@ -1,7 +1,7 @@ /// \file AliITSUpgradeDigi.cxx /// \brief Digits structure for ITS digits -#include "itsSimulation/Digit.h" +#include "ITSSimulation/Digit.h" ClassImp(AliceO2::ITS::Digit) diff --git a/Detectors/ITSMFT/ITS/simulation/src/DigitContainer.cxx b/Detectors/ITSMFT/ITS/simulation/src/DigitContainer.cxx index 20b957a0d3638..7b9ca206d4d2d 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/DigitContainer.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/DigitContainer.cxx @@ -5,10 +5,10 @@ // Created by Markus Fasel on 25.03.15. // // -#include "itsSimulation/DigitContainer.h" -#include "itsSimulation/UpgradeGeometryTGeo.h" -#include "itsSimulation/Digit.h" -#include "itsSimulation/DigitLayer.h" +#include "ITSSimulation/DigitContainer.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/Digit.h" +#include "ITSSimulation/DigitLayer.h" #include "FairLogger.h" // for LOG #include "Rtypes.h" // for Int_t, nullptr diff --git a/Detectors/ITSMFT/ITS/simulation/src/DigitLayer.cxx b/Detectors/ITSMFT/ITS/simulation/src/DigitLayer.cxx index 3f520427bb7ab..7a715a1088a10 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/DigitLayer.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/DigitLayer.cxx @@ -8,8 +8,8 @@ -#include "itsSimulation/DigitLayer.h" -#include "itsSimulation/DigitStave.h" +#include "ITSSimulation/DigitLayer.h" +#include "ITSSimulation/DigitStave.h" #include "FairLogger.h" diff --git a/Detectors/ITSMFT/ITS/simulation/src/DigitStave.cxx b/Detectors/ITSMFT/ITS/simulation/src/DigitStave.cxx index cddf0ecd5ed72..a6c149885e972 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/DigitStave.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/DigitStave.cxx @@ -5,8 +5,8 @@ // Created by Markus Fasel on 26.03.15. // // -#include "itsSimulation/DigitStave.h" -#include "itsSimulation/Digit.h" +#include "ITSSimulation/DigitStave.h" +#include "ITSSimulation/Digit.h" #include "FairLogger.h" // for LOG diff --git a/Detectors/ITSMFT/ITS/simulation/src/DigitWriteoutBuffer.cxx b/Detectors/ITSMFT/ITS/simulation/src/DigitWriteoutBuffer.cxx index cd454b70d7d4d..41d2cef2da53f 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/DigitWriteoutBuffer.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/DigitWriteoutBuffer.cxx @@ -5,7 +5,7 @@ // Created by Markus Fasel on 21.07.15. // // -#include "itsSimulation/DigitWriteoutBuffer.h" +#include "ITSSimulation/DigitWriteoutBuffer.h" #include "FairRootManager.h" // for FairRootManager #include "TClonesArray.h" // for TClonesArray #include "TString.h" // for TString diff --git a/Detectors/ITSMFT/ITS/simulation/src/Digitizer.cxx b/Detectors/ITSMFT/ITS/simulation/src/Digitizer.cxx index 02d4d84970eed..c2b4e8a893c8b 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/Digitizer.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/Digitizer.cxx @@ -1,10 +1,10 @@ /// \file AliITSUpgradeDigitizer.cxx /// \brief Digitizer for the upgrated ITS -#include "itsSimulation/Digitizer.h" -#include "itsSimulation/Point.h" -#include "itsSimulation/UpgradeGeometryTGeo.h" -#include "itsSimulation/Digit.h" -#include "itsSimulation/DigitContainer.h" +#include "ITSSimulation/Digitizer.h" +#include "ITSSimulation/Point.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/Digit.h" +#include "ITSSimulation/DigitContainer.h" #include "FairLogger.h" // for LOG #include "TClonesArray.h" // for TClonesArray diff --git a/Detectors/ITSMFT/ITS/simulation/src/DigitizerTask.cxx b/Detectors/ITSMFT/ITS/simulation/src/DigitizerTask.cxx index 3a1afd9848c3e..3ca2beb025d96 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/DigitizerTask.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/DigitizerTask.cxx @@ -6,9 +6,9 @@ // // -#include "itsSimulation/DigitizerTask.h" -#include "itsSimulation/DigitContainer.h" -#include "itsSimulation/Digitizer.h" +#include "ITSSimulation/DigitizerTask.h" +#include "ITSSimulation/DigitContainer.h" +#include "ITSSimulation/Digitizer.h" #include "TObject.h" // for TObject #include "TClonesArray.h" // for TClonesArray diff --git a/Detectors/ITSMFT/ITS/simulation/src/GeometryHandler.cxx b/Detectors/ITSMFT/ITS/simulation/src/GeometryHandler.cxx index 38dec0daa6091..8558d62e752e7 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/GeometryHandler.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/GeometryHandler.cxx @@ -2,7 +2,7 @@ /// \brief Implementation of the GeometryHandler class /// \author F. Uhlig -#include "itsSimulation/GeometryHandler.h" +#include "ITSSimulation/GeometryHandler.h" #include "FairLogger.h" // for FairLogger, etc diff --git a/Detectors/ITSMFT/ITS/simulation/src/GeometryManager.cxx b/Detectors/ITSMFT/ITS/simulation/src/GeometryManager.cxx index 0cdf93a9ea17b..f1f7772e7b4e5 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/GeometryManager.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/GeometryManager.cxx @@ -1,7 +1,7 @@ /// \file GeometryManager.cxx /// \brief Implementation of the GeometryManager class -#include "itsSimulation/GeometryManager.h" +#include "ITSSimulation/GeometryManager.h" #include "FairLogger.h" // for LOG diff --git a/Detectors/ITSMFT/ITS/simulation/src/itsSimulationLinkDef.h b/Detectors/ITSMFT/ITS/simulation/src/ITSSimulationLinkDef.h similarity index 100% rename from Detectors/ITSMFT/ITS/simulation/src/itsSimulationLinkDef.h rename to Detectors/ITSMFT/ITS/simulation/src/ITSSimulationLinkDef.h diff --git a/Detectors/ITSMFT/ITS/simulation/src/Point.cxx b/Detectors/ITSMFT/ITS/simulation/src/Point.cxx index f10aebabba98f..3bff229c3e4c9 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/Point.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/Point.cxx @@ -1,7 +1,7 @@ /// \file Point.cxx /// \brief Implementation of the Point class -#include "itsSimulation/Point.h" +#include "ITSSimulation/Point.h" #include diff --git a/Detectors/ITSMFT/ITS/simulation/src/Segmentation.cxx b/Detectors/ITSMFT/ITS/simulation/src/Segmentation.cxx index 9e3614b69f0a7..75451229fe1e7 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/Segmentation.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/Segmentation.cxx @@ -1,7 +1,7 @@ /// \file Segmentation.cxx /// \brief Implementation of the Segmentation class -#include "itsSimulation/Segmentation.h" +#include "ITSSimulation/Segmentation.h" #include "TF1.h" // for TF1 using namespace AliceO2::ITS; diff --git a/Detectors/ITSMFT/ITS/simulation/src/UpgradeGeometryTGeo.cxx b/Detectors/ITSMFT/ITS/simulation/src/UpgradeGeometryTGeo.cxx index 28e369c7106ac..87ec668034d78 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/UpgradeGeometryTGeo.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/UpgradeGeometryTGeo.cxx @@ -4,10 +4,10 @@ /// \author ruben.shahoyan@cern.ch - adapted to ITSupg 18/07/2012 // ATTENTION: In opposite to old AliITSgeomTGeo, all indices start from 0, not from 1!!! -#include "itsSimulation/UpgradeGeometryTGeo.h" -#include "itsSimulation/UpgradeSegmentationPixel.h" -#include "itsSimulation/GeometryManager.h" -#include "itsSimulation/Segmentation.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/UpgradeSegmentationPixel.h" +#include "ITSSimulation/GeometryManager.h" +#include "ITSSimulation/Segmentation.h" #include "FairLogger.h" // for LOG diff --git a/Detectors/ITSMFT/ITS/simulation/src/UpgradeSegmentationPixel.cxx b/Detectors/ITSMFT/ITS/simulation/src/UpgradeSegmentationPixel.cxx index a0f587b769121..0934e2b2c6e4e 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/UpgradeSegmentationPixel.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/UpgradeSegmentationPixel.cxx @@ -1,8 +1,8 @@ /// \file UpgradeSegmentationPixel.cxx /// \brief Implementation of the UpgradeSegmentationPixel class -#include "itsSimulation/UpgradeSegmentationPixel.h" -#include "itsSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/UpgradeSegmentationPixel.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" #include // for TFile #include // for TObjArray diff --git a/Detectors/ITSMFT/ITS/simulation/src/UpgradeV1Layer.cxx b/Detectors/ITSMFT/ITS/simulation/src/UpgradeV1Layer.cxx index ae0266643e3fc..aade83e0266a6 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/UpgradeV1Layer.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/UpgradeV1Layer.cxx @@ -3,9 +3,9 @@ /// \author Mario Sitta /// \author Chinorat Kobdaj (kobdaj@g.sut.ac.th) -#include "itsSimulation/UpgradeV1Layer.h" -#include "itsSimulation/UpgradeGeometryTGeo.h" -#include "itsSimulation/Detector.h" +#include "ITSSimulation/UpgradeV1Layer.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/Detector.h" #include "FairLogger.h" // for LOG diff --git a/Detectors/ITSMFT/ITS/simulation/src/V11Geometry.cxx b/Detectors/ITSMFT/ITS/simulation/src/V11Geometry.cxx index abfdccfad0348..0d4de9335be2c 100644 --- a/Detectors/ITSMFT/ITS/simulation/src/V11Geometry.cxx +++ b/Detectors/ITSMFT/ITS/simulation/src/V11Geometry.cxx @@ -2,7 +2,7 @@ /// \brief Implementation of the V11Geometry class -#include "itsSimulation/V11Geometry.h" +#include "ITSSimulation/V11Geometry.h" #include "FairLogger.h" // for LOG diff --git a/Detectors/ITSMFT/test/HitAnalysis/CMakeLists.txt b/Detectors/ITSMFT/test/HitAnalysis/CMakeLists.txt index d34e8a44f531a..8fcc47851f080 100644 --- a/Detectors/ITSMFT/test/HitAnalysis/CMakeLists.txt +++ b/Detectors/ITSMFT/test/HitAnalysis/CMakeLists.txt @@ -8,9 +8,9 @@ set(SRCS set(HEADERS include/HitAnalysis/HitAnalysis.h ) -Set(LINKDEF src/testitsLinkDef.h) -Set(LIBRARY_NAME testits) -set(BUCKET_NAME itsmft_test) +Set(LINKDEF src/HitAnalysisLinkDef.h) +Set(LIBRARY_NAME ${MODULE_NAME}) +set(BUCKET_NAME hitanalysis_bucket) O2_GENERATE_LIBRARY() diff --git a/Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysis.cxx b/Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysis.cxx index c84fd38a693e4..209effa67dd70 100644 --- a/Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysis.cxx +++ b/Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysis.cxx @@ -14,10 +14,10 @@ #include "TH1.h" // for TH1, TH1D, TH1F #include "TMath.h" -#include "itsSimulation/Chip.h" -#include "itsSimulation/Point.h" -#include "itsSimulation/Segmentation.h" -#include "itsSimulation/UpgradeGeometryTGeo.h" +#include "ITSSimulation/Chip.h" +#include "ITSSimulation/Point.h" +#include "ITSSimulation/Segmentation.h" +#include "ITSSimulation/UpgradeGeometryTGeo.h" using namespace AliceO2::ITS; diff --git a/Detectors/ITSMFT/test/HitAnalysis/src/testitsLinkDef.h b/Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysisLinkDef.h similarity index 100% rename from Detectors/ITSMFT/test/HitAnalysis/src/testitsLinkDef.h rename to Detectors/ITSMFT/test/HitAnalysis/src/HitAnalysisLinkDef.h diff --git a/Detectors/TPC/CMakeLists.txt b/Detectors/TPC/CMakeLists.txt index 1763c35665f45..d986b027851dc 100644 --- a/Detectors/TPC/CMakeLists.txt +++ b/Detectors/TPC/CMakeLists.txt @@ -15,5 +15,4 @@ # Libraries add_subdirectory(base) -#add_subdirectory(reconstruction) add_subdirectory(simulation) diff --git a/Detectors/TPC/base/CMakeLists.txt b/Detectors/TPC/base/CMakeLists.txt index ab47fa4f34e9f..2f69bbc8f2e41 100644 --- a/Detectors/TPC/base/CMakeLists.txt +++ b/Detectors/TPC/base/CMakeLists.txt @@ -1,4 +1,4 @@ -set(MODULE_NAME "TPCbase") +set(MODULE_NAME "TPCBase") O2_SETUP(NAME ${MODULE_NAME}) @@ -19,24 +19,24 @@ set(SRCS ) set(HEADERS - include/TPCbase/ContainerFactory.h - include/TPCbase/CRU.h -# include/TPCbase/Defs.h - include/TPCbase/DigitPos.h - include/TPCbase/FECInfo.h - include/TPCbase/Mapper.h - include/TPCbase/PadInfo.h - include/TPCbase/PadPos.h - include/TPCbase/PadRegionInfo.h - include/TPCbase/PadSecPos.h - include/TPCbase/Point2D.h - include/TPCbase/Point3D.h - include/TPCbase/ROC.h - include/TPCbase/Defs.h - include/TPCbase/Sector.h + include/TPCBase/ContainerFactory.h + include/TPCBase/CRU.h +# include/TPCBase/Defs.h + include/TPCBase/DigitPos.h + include/TPCBase/FECInfo.h + include/TPCBase/Mapper.h + include/TPCBase/PadInfo.h + include/TPCBase/PadPos.h + include/TPCBase/PadRegionInfo.h + include/TPCBase/PadSecPos.h + include/TPCBase/Point2D.h + include/TPCBase/Point3D.h + include/TPCBase/ROC.h + include/TPCBase/Defs.h + include/TPCBase/Sector.h ) -Set(LINKDEF src/tpcBaseLinkDef.h) +Set(LINKDEF src/TPCBaseLinkDef.h) Set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME tpc_base_bucket) diff --git a/Detectors/TPC/base/include/TPCbase/CRU.h b/Detectors/TPC/base/include/TPCBase/CRU.h similarity index 95% rename from Detectors/TPC/base/include/TPCbase/CRU.h rename to Detectors/TPC/base/include/TPCBase/CRU.h index 5449087502b95..7df2b6dafb464 100644 --- a/Detectors/TPC/base/include/TPCbase/CRU.h +++ b/Detectors/TPC/base/include/TPCBase/CRU.h @@ -1,9 +1,9 @@ #ifndef AliceO2_TPC_CRU_H #define AliceO2_TPC_CRU_H -#include "TPCbase/Defs.h" -#include "TPCbase/Sector.h" -#include "TPCbase/ROC.h" +#include "TPCBase/Defs.h" +#include "TPCBase/Sector.h" +#include "TPCBase/ROC.h" //using namespace AliceO2::TPC; namespace AliceO2 { diff --git a/Detectors/TPC/base/include/TPCbase/ContainerFactory.h b/Detectors/TPC/base/include/TPCBase/ContainerFactory.h similarity index 100% rename from Detectors/TPC/base/include/TPCbase/ContainerFactory.h rename to Detectors/TPC/base/include/TPCBase/ContainerFactory.h diff --git a/Detectors/TPC/base/include/TPCbase/Defs.h b/Detectors/TPC/base/include/TPCBase/Defs.h similarity index 100% rename from Detectors/TPC/base/include/TPCbase/Defs.h rename to Detectors/TPC/base/include/TPCBase/Defs.h diff --git a/Detectors/TPC/base/include/TPCbase/DigitPos.h b/Detectors/TPC/base/include/TPCBase/DigitPos.h similarity index 90% rename from Detectors/TPC/base/include/TPCbase/DigitPos.h rename to Detectors/TPC/base/include/TPCBase/DigitPos.h index 545f33059e9ec..83319c773fad3 100644 --- a/Detectors/TPC/base/include/TPCbase/DigitPos.h +++ b/Detectors/TPC/base/include/TPCBase/DigitPos.h @@ -1,10 +1,10 @@ #ifndef AliceO2_TPC_DigitPos_H #define AliceO2_TPC_DigitPos_H -#include "TPCbase/Defs.h" -#include "TPCbase/CRU.h" -#include "TPCbase/PadPos.h" -#include "TPCbase/PadSecPos.h" +#include "TPCBase/Defs.h" +#include "TPCBase/CRU.h" +#include "TPCBase/PadPos.h" +#include "TPCBase/PadSecPos.h" namespace AliceO2 { namespace TPC { diff --git a/Detectors/TPC/base/include/TPCbase/FECInfo.h b/Detectors/TPC/base/include/TPCBase/FECInfo.h similarity index 100% rename from Detectors/TPC/base/include/TPCbase/FECInfo.h rename to Detectors/TPC/base/include/TPCBase/FECInfo.h diff --git a/Detectors/TPC/base/include/TPCbase/Mapper.h b/Detectors/TPC/base/include/TPCBase/Mapper.h similarity index 96% rename from Detectors/TPC/base/include/TPCbase/Mapper.h rename to Detectors/TPC/base/include/TPCBase/Mapper.h index 9c8b4a5e0d569..1fa79689e51f4 100644 --- a/Detectors/TPC/base/include/TPCbase/Mapper.h +++ b/Detectors/TPC/base/include/TPCBase/Mapper.h @@ -5,11 +5,11 @@ #include #include -#include "TPCbase/Defs.h" -#include "TPCbase/PadPos.h" -#include "TPCbase/DigitPos.h" -#include "TPCbase/FECInfo.h" -#include "TPCbase/PadRegionInfo.h" +#include "TPCBase/Defs.h" +#include "TPCBase/PadPos.h" +#include "TPCBase/DigitPos.h" +#include "TPCBase/FECInfo.h" +#include "TPCBase/PadRegionInfo.h" using AliceO2::TPC::PadRegionInfo; diff --git a/Detectors/TPC/base/include/TPCbase/PadInfo.h b/Detectors/TPC/base/include/TPCBase/PadInfo.h similarity index 80% rename from Detectors/TPC/base/include/TPCbase/PadInfo.h rename to Detectors/TPC/base/include/TPCBase/PadInfo.h index fc274c6829f8e..3c26bb687004c 100644 --- a/Detectors/TPC/base/include/TPCbase/PadInfo.h +++ b/Detectors/TPC/base/include/TPCBase/PadInfo.h @@ -1,10 +1,10 @@ #ifndef AliceO2_TPC_PadInfo_H #define AliceO2_TPC_PadInfo_H -#include "TPCbase/Defs.h" -#include "TPCbase/PadPos.h" -#include "TPCbase/Point2D.h" -#include "TPCbase/FECInfo.h" +#include "TPCBase/Defs.h" +#include "TPCBase/PadPos.h" +#include "TPCBase/Point2D.h" +#include "TPCBase/FECInfo.h" namespace AliceO2 { namespace TPC { diff --git a/Detectors/TPC/base/include/TPCbase/PadPos.h b/Detectors/TPC/base/include/TPCBase/PadPos.h similarity index 100% rename from Detectors/TPC/base/include/TPCbase/PadPos.h rename to Detectors/TPC/base/include/TPCBase/PadPos.h diff --git a/Detectors/TPC/base/include/TPCbase/PadRegionInfo.h b/Detectors/TPC/base/include/TPCBase/PadRegionInfo.h similarity index 98% rename from Detectors/TPC/base/include/TPCbase/PadRegionInfo.h rename to Detectors/TPC/base/include/TPCBase/PadRegionInfo.h index c5756f35a0c0b..e420d92768a04 100644 --- a/Detectors/TPC/base/include/TPCbase/PadRegionInfo.h +++ b/Detectors/TPC/base/include/TPCBase/PadRegionInfo.h @@ -3,8 +3,8 @@ #include -#include "TPCbase/Defs.h" -#include "TPCbase/PadPos.h" +#include "TPCBase/Defs.h" +#include "TPCBase/PadPos.h" namespace AliceO2 { namespace TPC { diff --git a/Detectors/TPC/base/include/TPCbase/PadSecPos.h b/Detectors/TPC/base/include/TPCBase/PadSecPos.h similarity index 90% rename from Detectors/TPC/base/include/TPCbase/PadSecPos.h rename to Detectors/TPC/base/include/TPCBase/PadSecPos.h index 04727f246c5c2..c508e436c99ea 100644 --- a/Detectors/TPC/base/include/TPCbase/PadSecPos.h +++ b/Detectors/TPC/base/include/TPCBase/PadSecPos.h @@ -1,8 +1,8 @@ #ifndef AliceO2_TPC_PadSecPos_H #define AliceO2_TPC_PadSecPos_H -#include "TPCbase/Sector.h" -#include "TPCbase/PadPos.h" +#include "TPCBase/Sector.h" +#include "TPCBase/PadPos.h" namespace AliceO2 { namespace TPC { diff --git a/Detectors/TPC/base/include/TPCbase/Point2D.h b/Detectors/TPC/base/include/TPCBase/Point2D.h similarity index 100% rename from Detectors/TPC/base/include/TPCbase/Point2D.h rename to Detectors/TPC/base/include/TPCBase/Point2D.h diff --git a/Detectors/TPC/base/include/TPCbase/Point3D.h b/Detectors/TPC/base/include/TPCBase/Point3D.h similarity index 100% rename from Detectors/TPC/base/include/TPCbase/Point3D.h rename to Detectors/TPC/base/include/TPCBase/Point3D.h diff --git a/Detectors/TPC/base/include/TPCbase/ROC.h b/Detectors/TPC/base/include/TPCBase/ROC.h similarity index 96% rename from Detectors/TPC/base/include/TPCbase/ROC.h rename to Detectors/TPC/base/include/TPCBase/ROC.h index 42ee628e2c929..a69f0aa594ec6 100644 --- a/Detectors/TPC/base/include/TPCbase/ROC.h +++ b/Detectors/TPC/base/include/TPCBase/ROC.h @@ -1,8 +1,8 @@ #ifndef AliceO2_TPC_ROC_H #define AliceO2_TPC_ROC_H -#include "TPCbase/Defs.h" -#include "TPCbase/Sector.h" +#include "TPCBase/Defs.h" +#include "TPCBase/Sector.h" //using namespace AliceO2::TPC; namespace AliceO2 { diff --git a/Detectors/TPC/base/include/TPCbase/Sector.h b/Detectors/TPC/base/include/TPCBase/Sector.h similarity index 98% rename from Detectors/TPC/base/include/TPCbase/Sector.h rename to Detectors/TPC/base/include/TPCBase/Sector.h index 0d5a3b92320a4..7449db982c790 100644 --- a/Detectors/TPC/base/include/TPCbase/Sector.h +++ b/Detectors/TPC/base/include/TPCBase/Sector.h @@ -1,7 +1,7 @@ #ifndef AliceO2_TPC_Sector_H #define AliceO2_TPC_Sector_H -#include "TPCbase/Defs.h" +#include "TPCBase/Defs.h" //using namespace AliceO2::TPC; namespace AliceO2 { diff --git a/Detectors/TPC/base/src/CRU.cxx b/Detectors/TPC/base/src/CRU.cxx index 020dce4b07798..33ba2c0fd53bf 100644 --- a/Detectors/TPC/base/src/CRU.cxx +++ b/Detectors/TPC/base/src/CRU.cxx @@ -1 +1 @@ -#include "TPCbase/CRU.h" +#include "TPCBase/CRU.h" diff --git a/Detectors/TPC/base/src/ContainerFactory.cxx b/Detectors/TPC/base/src/ContainerFactory.cxx index e4e330d2e403d..028d9faebe666 100644 --- a/Detectors/TPC/base/src/ContainerFactory.cxx +++ b/Detectors/TPC/base/src/ContainerFactory.cxx @@ -1,5 +1,5 @@ -#include "TPCbase/ContainerFactory.h" +#include "TPCBase/ContainerFactory.h" #include "FairRuntimeDb.h" // for FairRuntimeDb class FairParSet; diff --git a/Detectors/TPC/base/src/DigitPos.cxx b/Detectors/TPC/base/src/DigitPos.cxx index a50338bcad3a7..6311afc24a95c 100644 --- a/Detectors/TPC/base/src/DigitPos.cxx +++ b/Detectors/TPC/base/src/DigitPos.cxx @@ -1,5 +1,5 @@ -#include "TPCbase/DigitPos.h" -#include "TPCbase/Mapper.h" +#include "TPCBase/DigitPos.h" +#include "TPCBase/Mapper.h" namespace AliceO2 { namespace TPC { diff --git a/Detectors/TPC/base/src/FECInfo.cxx b/Detectors/TPC/base/src/FECInfo.cxx index 4e1f974e88469..fe1d1b3a23707 100644 --- a/Detectors/TPC/base/src/FECInfo.cxx +++ b/Detectors/TPC/base/src/FECInfo.cxx @@ -1 +1 @@ -#include "TPCbase/FECInfo.h" +#include "TPCBase/FECInfo.h" diff --git a/Detectors/TPC/base/src/Mapper.cxx b/Detectors/TPC/base/src/Mapper.cxx index f60cf9e62cb79..7916e51ef2ffd 100644 --- a/Detectors/TPC/base/src/Mapper.cxx +++ b/Detectors/TPC/base/src/Mapper.cxx @@ -10,7 +10,7 @@ // using std::endl; // using boost::format; -#include "TPCbase/Mapper.h" +#include "TPCBase/Mapper.h" namespace AliceO2 { namespace TPC { diff --git a/Detectors/TPC/base/src/PadInfo.cxx b/Detectors/TPC/base/src/PadInfo.cxx index 3f714932293b0..0acf9459a0220 100644 --- a/Detectors/TPC/base/src/PadInfo.cxx +++ b/Detectors/TPC/base/src/PadInfo.cxx @@ -1 +1 @@ -#include "TPCbase/PadInfo.h" +#include "TPCBase/PadInfo.h" diff --git a/Detectors/TPC/base/src/PadPos.cxx b/Detectors/TPC/base/src/PadPos.cxx index 374c9b15c36fa..3429cfe5ed946 100644 --- a/Detectors/TPC/base/src/PadPos.cxx +++ b/Detectors/TPC/base/src/PadPos.cxx @@ -1 +1 @@ -#include "TPCbase/PadPos.h" +#include "TPCBase/PadPos.h" diff --git a/Detectors/TPC/base/src/PadRegionInfo.cxx b/Detectors/TPC/base/src/PadRegionInfo.cxx index 7ad691b36afab..1013435020ea3 100644 --- a/Detectors/TPC/base/src/PadRegionInfo.cxx +++ b/Detectors/TPC/base/src/PadRegionInfo.cxx @@ -1,6 +1,6 @@ #include -#include "TPCbase/PadRegionInfo.h" +#include "TPCBase/PadRegionInfo.h" namespace AliceO2 { namespace TPC { diff --git a/Detectors/TPC/base/src/PadSecPos.cxx b/Detectors/TPC/base/src/PadSecPos.cxx index 4ca72c704c425..993d08663cdd1 100644 --- a/Detectors/TPC/base/src/PadSecPos.cxx +++ b/Detectors/TPC/base/src/PadSecPos.cxx @@ -1 +1 @@ -#include "TPCbase/PadSecPos.h" +#include "TPCBase/PadSecPos.h" diff --git a/Detectors/TPC/base/src/Point2D.cxx b/Detectors/TPC/base/src/Point2D.cxx index 5befe74245348..954373403de52 100644 --- a/Detectors/TPC/base/src/Point2D.cxx +++ b/Detectors/TPC/base/src/Point2D.cxx @@ -1 +1 @@ -#include "TPCbase/Point2D.h" +#include "TPCBase/Point2D.h" diff --git a/Detectors/TPC/base/src/Point3D.cxx b/Detectors/TPC/base/src/Point3D.cxx index 6411140d197cc..2ba7c2517489d 100644 --- a/Detectors/TPC/base/src/Point3D.cxx +++ b/Detectors/TPC/base/src/Point3D.cxx @@ -1 +1 @@ -#include "TPCbase/Point3D.h" +#include "TPCBase/Point3D.h" diff --git a/Detectors/TPC/base/src/ROC.cxx b/Detectors/TPC/base/src/ROC.cxx index ebbae7e8f22f9..e0046e59b800c 100644 --- a/Detectors/TPC/base/src/ROC.cxx +++ b/Detectors/TPC/base/src/ROC.cxx @@ -1 +1 @@ -#include "TPCbase/ROC.h" +#include "TPCBase/ROC.h" diff --git a/Detectors/TPC/base/src/Sector.cxx b/Detectors/TPC/base/src/Sector.cxx index ebbae7e8f22f9..e0046e59b800c 100644 --- a/Detectors/TPC/base/src/Sector.cxx +++ b/Detectors/TPC/base/src/Sector.cxx @@ -1 +1 @@ -#include "TPCbase/ROC.h" +#include "TPCBase/ROC.h" diff --git a/Detectors/TPC/base/src/tpcBaseLinkDef.h b/Detectors/TPC/base/src/TPCBaseLinkDef.h similarity index 100% rename from Detectors/TPC/base/src/tpcBaseLinkDef.h rename to Detectors/TPC/base/src/TPCBaseLinkDef.h diff --git a/Detectors/TPC/reconstruction/CMakeLists.txt b/Detectors/TPC/reconstruction/CMakeLists.txt deleted file mode 100644 index e2fe306b91799..0000000000000 --- a/Detectors/TPC/reconstruction/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -set(INCLUDE_DIRECTORIES - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/detectors/tpc -) - -set(SYSTEM_INCLUDE_DIRECTORIES - ${CMAKE_SOURCE_DIR} - ${BASE_INCLUDE_DIRECTORIES} - ${Boost_INCLUDE_DIRS} - ${FAIRROOT_INCLUDE_DIR} - ${ROOT_INCLUDE_DIR} -) - -include_directories( ${INCLUDE_DIRECTORIES}) -include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) - -set(LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} - ${FAIRROOT_LIBRARY_DIR} -) - -link_directories( ${LINK_DIRECTORIES}) - -set(SRCS - -) - -set(HEADERS - -) -Set(LINKDEF src/tpcReconstructionLinkDef.h) -Set(LIBRARY_NAME tpcReconstruction) -Set(DEPENDENCIES - tpcBase -) - -GENERATE_LIBRARY() diff --git a/Detectors/TPC/simulation/CMakeLists.txt b/Detectors/TPC/simulation/CMakeLists.txt index 8cc956cd2b017..caf90ad3b4af4 100644 --- a/Detectors/TPC/simulation/CMakeLists.txt +++ b/Detectors/TPC/simulation/CMakeLists.txt @@ -1,5 +1,4 @@ -set(MODULE_NAME "TPCsimulation") - +set(MODULE_NAME "TPCSimulation") O2_SETUP(NAME ${MODULE_NAME}) @@ -43,8 +42,8 @@ set(HEADERS include/${MODULE_NAME}/ClustererTask.h ) -Set(LINKDEF src/tpcSimulationLinkDef.h) -Set(LIBRARY_NAME tpcSimulation) +Set(LINKDEF src/TPCSimulationLinkDef.h) +Set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME tpc_simulation_bucket) O2_GENERATE_LIBRARY() diff --git a/Detectors/TPC/simulation/include/TPCsimulation/BoxCluster.h b/Detectors/TPC/simulation/include/TPCSimulation/BoxCluster.h similarity index 98% rename from Detectors/TPC/simulation/include/TPCsimulation/BoxCluster.h rename to Detectors/TPC/simulation/include/TPCSimulation/BoxCluster.h index d18b1ada957a8..080bfe507759b 100644 --- a/Detectors/TPC/simulation/include/TPCsimulation/BoxCluster.h +++ b/Detectors/TPC/simulation/include/TPCSimulation/BoxCluster.h @@ -7,7 +7,7 @@ #include // for base_object #endif -#include "TPCsimulation/Cluster.h" +#include "TPCSimulation/Cluster.h" #include "FairTimeStamp.h" // for FairTimeStamp #include "Rtypes.h" // for Double_t, ULong_t, etc namespace boost { namespace serialization { class access; } } diff --git a/Detectors/TPC/simulation/include/TPCsimulation/BoxClusterer.h b/Detectors/TPC/simulation/include/TPCSimulation/BoxClusterer.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/BoxClusterer.h rename to Detectors/TPC/simulation/include/TPCSimulation/BoxClusterer.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/Cluster.h b/Detectors/TPC/simulation/include/TPCSimulation/Cluster.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/Cluster.h rename to Detectors/TPC/simulation/include/TPCSimulation/Cluster.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/ClusterCRU.h b/Detectors/TPC/simulation/include/TPCSimulation/ClusterCRU.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/ClusterCRU.h rename to Detectors/TPC/simulation/include/TPCSimulation/ClusterCRU.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/ClusterContainer.h b/Detectors/TPC/simulation/include/TPCSimulation/ClusterContainer.h similarity index 97% rename from Detectors/TPC/simulation/include/TPCsimulation/ClusterContainer.h rename to Detectors/TPC/simulation/include/TPCSimulation/ClusterContainer.h index 0edd26caa6726..fd47850573d3d 100644 --- a/Detectors/TPC/simulation/include/TPCsimulation/ClusterContainer.h +++ b/Detectors/TPC/simulation/include/TPCSimulation/ClusterContainer.h @@ -3,7 +3,7 @@ #ifndef _ALICEO2_TPC_ClusterContainer_ #define _ALICEO2_TPC_ClusterContainer_ -#include "TPCsimulation/Cluster.h" +#include "TPCSimulation/Cluster.h" #include "Rtypes.h" #include "TClonesArray.h" diff --git a/Detectors/TPC/simulation/include/TPCsimulation/ClusterRow.h b/Detectors/TPC/simulation/include/TPCSimulation/ClusterRow.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/ClusterRow.h rename to Detectors/TPC/simulation/include/TPCSimulation/ClusterRow.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/ClustererTask.h b/Detectors/TPC/simulation/include/TPCSimulation/ClustererTask.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/ClustererTask.h rename to Detectors/TPC/simulation/include/TPCSimulation/ClustererTask.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/Detector.h b/Detectors/TPC/simulation/include/TPCSimulation/Detector.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/Detector.h rename to Detectors/TPC/simulation/include/TPCSimulation/Detector.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/Digit.h b/Detectors/TPC/simulation/include/TPCSimulation/Digit.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/Digit.h rename to Detectors/TPC/simulation/include/TPCSimulation/Digit.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/DigitADC.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitADC.h similarity index 93% rename from Detectors/TPC/simulation/include/TPCsimulation/DigitADC.h rename to Detectors/TPC/simulation/include/TPCSimulation/DigitADC.h index 6d8f4b2764302..38834f8aa2025 100644 --- a/Detectors/TPC/simulation/include/TPCsimulation/DigitADC.h +++ b/Detectors/TPC/simulation/include/TPCSimulation/DigitADC.h @@ -4,7 +4,7 @@ #define _ALICEO2_DigitADC_ #include "Rtypes.h" -#include "TPCsimulation/Digit.h" +#include "TPCSimulation/Digit.h" #include class TClonesArray; diff --git a/Detectors/TPC/simulation/include/TPCsimulation/DigitCRU.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitCRU.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/DigitCRU.h rename to Detectors/TPC/simulation/include/TPCSimulation/DigitCRU.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/DigitContainer.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitContainer.h similarity index 91% rename from Detectors/TPC/simulation/include/TPCsimulation/DigitContainer.h rename to Detectors/TPC/simulation/include/TPCSimulation/DigitContainer.h index 3d323fd936549..e57320c04c96e 100644 --- a/Detectors/TPC/simulation/include/TPCsimulation/DigitContainer.h +++ b/Detectors/TPC/simulation/include/TPCSimulation/DigitContainer.h @@ -3,8 +3,8 @@ #ifndef _ALICEO2_DigitContainer_ #define _ALICEO2_DigitContainer_ -#include "TPCsimulation/Digit.h" -#include "TPCsimulation/DigitCRU.h" +#include "TPCSimulation/Digit.h" +#include "TPCSimulation/DigitCRU.h" #include "Rtypes.h" #include diff --git a/Detectors/TPC/simulation/include/TPCsimulation/DigitPad.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitPad.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/DigitPad.h rename to Detectors/TPC/simulation/include/TPCSimulation/DigitPad.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/DigitRow.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitRow.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/DigitRow.h rename to Detectors/TPC/simulation/include/TPCSimulation/DigitRow.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/DigitTime.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitTime.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/DigitTime.h rename to Detectors/TPC/simulation/include/TPCSimulation/DigitTime.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/Digitizer.h b/Detectors/TPC/simulation/include/TPCSimulation/Digitizer.h similarity index 96% rename from Detectors/TPC/simulation/include/TPCsimulation/Digitizer.h rename to Detectors/TPC/simulation/include/TPCSimulation/Digitizer.h index f24aa921c1105..2651f536d5432 100644 --- a/Detectors/TPC/simulation/include/TPCsimulation/Digitizer.h +++ b/Detectors/TPC/simulation/include/TPCSimulation/Digitizer.h @@ -3,7 +3,7 @@ #ifndef ALICEO2_TPC_Digitizer_H_ #define ALICEO2_TPC_Digitizer_H_ -#include "TPCsimulation/DigitContainer.h" +#include "TPCSimulation/DigitContainer.h" #include "Rtypes.h" #include "TObject.h" diff --git a/Detectors/TPC/simulation/include/TPCsimulation/DigitizerTask.h b/Detectors/TPC/simulation/include/TPCSimulation/DigitizerTask.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/DigitizerTask.h rename to Detectors/TPC/simulation/include/TPCSimulation/DigitizerTask.h diff --git a/Detectors/TPC/simulation/include/TPCsimulation/Point.h b/Detectors/TPC/simulation/include/TPCSimulation/Point.h similarity index 100% rename from Detectors/TPC/simulation/include/TPCsimulation/Point.h rename to Detectors/TPC/simulation/include/TPCSimulation/Point.h diff --git a/Detectors/TPC/simulation/src/BoxCluster.cxx b/Detectors/TPC/simulation/src/BoxCluster.cxx index 022c2bb75023d..ea15cb97e714d 100644 --- a/Detectors/TPC/simulation/src/BoxCluster.cxx +++ b/Detectors/TPC/simulation/src/BoxCluster.cxx @@ -1,14 +1,13 @@ /// \file BoxCluster.cxx /// \brief Class to have some more info about the BoxClusterer clusters -#include "TPCsimulation/BoxCluster.h" -#include "TPCsimulation/Cluster.h" +#include "TPCSimulation/BoxCluster.h" +#include "TPCSimulation/Cluster.h" ClassImp(AliceO2::TPC::BoxCluster) using namespace AliceO2::TPC; - //________________________________________________________________________ BoxCluster::BoxCluster(): Cluster(), @@ -43,7 +42,6 @@ void BoxCluster::setBoxParameters(Short_t pad, Short_t time, Short_t size) mTime = time; } - //________________________________________________________________________ std::ostream &BoxCluster::Print(std::ostream &output) const { diff --git a/Detectors/TPC/simulation/src/BoxClusterer.cxx b/Detectors/TPC/simulation/src/BoxClusterer.cxx index 3075ed4f69841..37ffc75ff6167 100644 --- a/Detectors/TPC/simulation/src/BoxClusterer.cxx +++ b/Detectors/TPC/simulation/src/BoxClusterer.cxx @@ -79,10 +79,10 @@ */ -#include "TPCsimulation/BoxClusterer.h" -#include "TPCsimulation/Digit.h" -#include "TPCsimulation/ClusterContainer.h" -#include "TPCsimulation/BoxCluster.h" +#include "TPCSimulation/BoxClusterer.h" +#include "TPCSimulation/Digit.h" +#include "TPCSimulation/ClusterContainer.h" +#include "TPCSimulation/BoxCluster.h" #include "FairLogger.h" #include "TMath.h" diff --git a/Detectors/TPC/simulation/src/Cluster.cxx b/Detectors/TPC/simulation/src/Cluster.cxx index 80cd2711e6fed..2a2b3280d44b9 100644 --- a/Detectors/TPC/simulation/src/Cluster.cxx +++ b/Detectors/TPC/simulation/src/Cluster.cxx @@ -1,7 +1,7 @@ /// \file Cluster.cxx /// \brief Cluster structure for TPC clusters -#include "TPCsimulation/Cluster.h" +#include "TPCSimulation/Cluster.h" ClassImp(AliceO2::TPC::Cluster) diff --git a/Detectors/TPC/simulation/src/ClusterCRU.cxx b/Detectors/TPC/simulation/src/ClusterCRU.cxx index 31e485a06f549..64f0d7ff912d9 100644 --- a/Detectors/TPC/simulation/src/ClusterCRU.cxx +++ b/Detectors/TPC/simulation/src/ClusterCRU.cxx @@ -1,5 +1,5 @@ -#include "TPCsimulation/ClusterCRU.h" -#include "TPCsimulation/ClusterRow.h" +#include "TPCSimulation/ClusterCRU.h" +#include "TPCSimulation/ClusterRow.h" #include "FairLogger.h" using namespace AliceO2::TPC; diff --git a/Detectors/TPC/simulation/src/ClusterContainer.cxx b/Detectors/TPC/simulation/src/ClusterContainer.cxx index 8dd232f8676ee..2f88711e80f70 100644 --- a/Detectors/TPC/simulation/src/ClusterContainer.cxx +++ b/Detectors/TPC/simulation/src/ClusterContainer.cxx @@ -1,5 +1,5 @@ -#include "TPCsimulation/ClusterContainer.h" -#include "TPCsimulation/Cluster.h" +#include "TPCSimulation/ClusterContainer.h" +#include "TPCSimulation/Cluster.h" #include "FairLogger.h" diff --git a/Detectors/TPC/simulation/src/ClustererTask.cxx b/Detectors/TPC/simulation/src/ClustererTask.cxx index 7520ce95efa69..677383ca927f1 100644 --- a/Detectors/TPC/simulation/src/ClustererTask.cxx +++ b/Detectors/TPC/simulation/src/ClustererTask.cxx @@ -6,9 +6,9 @@ // // -#include "TPCsimulation/ClustererTask.h" -#include "TPCsimulation/ClusterContainer.h" // for ClusterContainer -#include "TPCsimulation/BoxClusterer.h" // for Clusterer +#include "TPCSimulation/ClustererTask.h" +#include "TPCSimulation/ClusterContainer.h" // for ClusterContainer +#include "TPCSimulation/BoxClusterer.h" // for Clusterer #include "TObject.h" // for TObject #include "TClonesArray.h" // for TClonesArray diff --git a/Detectors/TPC/simulation/src/Detector.cxx b/Detectors/TPC/simulation/src/Detector.cxx index 9a91bfb771a40..df2bf78cd7117 100644 --- a/Detectors/TPC/simulation/src/Detector.cxx +++ b/Detectors/TPC/simulation/src/Detector.cxx @@ -1,5 +1,5 @@ -#include "TPCsimulation/Detector.h" -#include "TPCsimulation/Point.h" +#include "TPCSimulation/Detector.h" +#include "TPCSimulation/Point.h" #include "SimulationDataFormat/DetectorList.h" #include "SimulationDataFormat/Stack.h" diff --git a/Detectors/TPC/simulation/src/Digit.cxx b/Detectors/TPC/simulation/src/Digit.cxx index a3105c4e185ca..8f47ff5bca631 100644 --- a/Detectors/TPC/simulation/src/Digit.cxx +++ b/Detectors/TPC/simulation/src/Digit.cxx @@ -1,7 +1,7 @@ /// \file AliITSUpgradeDigi.cxx /// \brief Digits structure for ITS digits -#include "TPCsimulation/Digit.h" +#include "TPCSimulation/Digit.h" ClassImp(AliceO2::TPC::Digit) diff --git a/Detectors/TPC/simulation/src/DigitADC.cxx b/Detectors/TPC/simulation/src/DigitADC.cxx index e698f8db1d5b2..9f13f2aed2f7f 100644 --- a/Detectors/TPC/simulation/src/DigitADC.cxx +++ b/Detectors/TPC/simulation/src/DigitADC.cxx @@ -1,5 +1,5 @@ -#include "TPCsimulation/DigitADC.h" -#include "TPCsimulation/Digit.h" // for Digit +#include "TPCSimulation/DigitADC.h" +#include "TPCSimulation/Digit.h" // for Digit using namespace AliceO2::TPC; diff --git a/Detectors/TPC/simulation/src/DigitCRU.cxx b/Detectors/TPC/simulation/src/DigitCRU.cxx index 56d859f4c0bb5..95b2f4f807068 100644 --- a/Detectors/TPC/simulation/src/DigitCRU.cxx +++ b/Detectors/TPC/simulation/src/DigitCRU.cxx @@ -1,7 +1,7 @@ -#include "TPCsimulation/DigitCRU.h" -#include "TPCsimulation/DigitRow.h" -#include "TPCsimulation/DigitPad.h" -#include "TPCbase/Mapper.h" +#include "TPCSimulation/DigitCRU.h" +#include "TPCSimulation/DigitRow.h" +#include "TPCSimulation/DigitPad.h" +#include "TPCBase/Mapper.h" #include "FairLogger.h" using namespace AliceO2::TPC; diff --git a/Detectors/TPC/simulation/src/DigitContainer.cxx b/Detectors/TPC/simulation/src/DigitContainer.cxx index 968af9eabf82b..cd239b0b506ac 100644 --- a/Detectors/TPC/simulation/src/DigitContainer.cxx +++ b/Detectors/TPC/simulation/src/DigitContainer.cxx @@ -1,8 +1,8 @@ -#include "TPCsimulation/DigitContainer.h" -#include "TPCsimulation/DigitCRU.h" -#include "TPCsimulation/Digit.h" -#include "TPCbase/Mapper.h" -#include "TPCbase/CRU.h" +#include "TPCSimulation/DigitContainer.h" +#include "TPCSimulation/DigitCRU.h" +#include "TPCSimulation/Digit.h" +#include "TPCBase/Mapper.h" +#include "TPCBase/CRU.h" #include "FairLogger.h" diff --git a/Detectors/TPC/simulation/src/DigitPad.cxx b/Detectors/TPC/simulation/src/DigitPad.cxx index 53c287e4ff1e9..642abc20db2e4 100644 --- a/Detectors/TPC/simulation/src/DigitPad.cxx +++ b/Detectors/TPC/simulation/src/DigitPad.cxx @@ -1,7 +1,7 @@ -#include "TPCsimulation/DigitTime.h" -#include "TPCsimulation/DigitPad.h" +#include "TPCSimulation/DigitTime.h" +#include "TPCSimulation/DigitPad.h" #include -#include "TPCbase/Mapper.h" +#include "TPCBase/Mapper.h" #include "FairLogger.h" using namespace AliceO2::TPC; diff --git a/Detectors/TPC/simulation/src/DigitRow.cxx b/Detectors/TPC/simulation/src/DigitRow.cxx index 34abaee1acbd6..b5c06104cc90b 100644 --- a/Detectors/TPC/simulation/src/DigitRow.cxx +++ b/Detectors/TPC/simulation/src/DigitRow.cxx @@ -1,6 +1,6 @@ -#include "TPCsimulation/DigitRow.h" -#include "TPCsimulation/DigitPad.h" -#include "TPCbase/Mapper.h" +#include "TPCSimulation/DigitRow.h" +#include "TPCSimulation/DigitPad.h" +#include "TPCBase/Mapper.h" #include "FairLogger.h" using namespace AliceO2::TPC; diff --git a/Detectors/TPC/simulation/src/DigitTime.cxx b/Detectors/TPC/simulation/src/DigitTime.cxx index b82b9b90661c6..2f3feab821f0e 100644 --- a/Detectors/TPC/simulation/src/DigitTime.cxx +++ b/Detectors/TPC/simulation/src/DigitTime.cxx @@ -1,8 +1,8 @@ -#include "TPCsimulation/DigitTime.h" -#include "TPCsimulation/DigitADC.h" -#include "TPCsimulation/Digit.h" +#include "TPCSimulation/DigitTime.h" +#include "TPCSimulation/DigitADC.h" +#include "TPCSimulation/Digit.h" #include "TClonesArray.h" -#include "TPCbase/Mapper.h" +#include "TPCBase/Mapper.h" #include "FairLogger.h" using namespace AliceO2::TPC; diff --git a/Detectors/TPC/simulation/src/Digitizer.cxx b/Detectors/TPC/simulation/src/Digitizer.cxx index 03efa82927a5e..7cdd8088ccf4f 100644 --- a/Detectors/TPC/simulation/src/Digitizer.cxx +++ b/Detectors/TPC/simulation/src/Digitizer.cxx @@ -1,13 +1,13 @@ /// \file AliTPCUpgradeDigitizer.cxx /// \brief Digitizer for the TPC -#include "TPCsimulation/Digitizer.h" -#include "TPCsimulation/Point.h" // for Point +#include "TPCSimulation/Digitizer.h" +#include "TPCSimulation/Point.h" // for Point #include "TRandom.h" #include "FairLogger.h" // for LOG #include "TClonesArray.h" // for TClonesArray #include "TCollection.h" // for TIter -#include "TPCbase/Mapper.h" +#include "TPCBase/Mapper.h" #include "TMath.h" #include diff --git a/Detectors/TPC/simulation/src/DigitizerTask.cxx b/Detectors/TPC/simulation/src/DigitizerTask.cxx index cd2f47d30f2c3..e4e76fc3b758b 100644 --- a/Detectors/TPC/simulation/src/DigitizerTask.cxx +++ b/Detectors/TPC/simulation/src/DigitizerTask.cxx @@ -6,9 +6,9 @@ // // -#include "TPCsimulation/DigitizerTask.h" -#include "TPCsimulation/DigitContainer.h" // for DigitContainer -#include "TPCsimulation/Digitizer.h" // for Digitizer +#include "TPCSimulation/DigitizerTask.h" +#include "TPCSimulation/DigitContainer.h" // for DigitContainer +#include "TPCSimulation/Digitizer.h" // for Digitizer #include "TObject.h" #include "TClonesArray.h" diff --git a/Detectors/TPC/simulation/src/Point.cxx b/Detectors/TPC/simulation/src/Point.cxx index 32be6d9d16c95..c26f66f5125eb 100644 --- a/Detectors/TPC/simulation/src/Point.cxx +++ b/Detectors/TPC/simulation/src/Point.cxx @@ -1,4 +1,4 @@ -#include "TPCsimulation/Point.h" +#include "TPCSimulation/Point.h" using std::cout; using std::endl; diff --git a/Detectors/TPC/simulation/src/tpcSimulationLinkDef.h b/Detectors/TPC/simulation/src/TPCSimulationLinkDef.h similarity index 100% rename from Detectors/TPC/simulation/src/tpcSimulationLinkDef.h rename to Detectors/TPC/simulation/src/TPCSimulationLinkDef.h diff --git a/Examples/ExampleModule1/CMakeLists.txt b/Examples/ExampleModule1/CMakeLists.txt index aabcdbc24d608..ed87f3a40e894 100644 --- a/Examples/ExampleModule1/CMakeLists.txt +++ b/Examples/ExampleModule1/CMakeLists.txt @@ -17,13 +17,13 @@ set(SRCS # ) set(LIBRARY_NAME ${MODULE_NAME}) -set(BUCKET_NAME ExampleModule1_Bucket) +set(BUCKET_NAME ExampleModule1_bucket) O2_GENERATE_LIBRARY() # todo we repeat ourselves because the above macro dares deleting the variables we pass to it. set(LIBRARY_NAME ${MODULE_NAME}) -set(BUCKET_NAME ExampleModule1_Bucket) +set(BUCKET_NAME ExampleModule1_bucket) # Define application O2_GENERATE_EXECUTABLE( diff --git a/Examples/ExampleModule2/CMakeLists.txt b/Examples/ExampleModule2/CMakeLists.txt index 92aacc1445d3f..aa63ffef9f1c3 100644 --- a/Examples/ExampleModule2/CMakeLists.txt +++ b/Examples/ExampleModule2/CMakeLists.txt @@ -18,15 +18,15 @@ set(HEADERS # needed for the dictionary generation include/${MODULE_NAME}/Foo.h ) -set(LIBRARY_NAME ExampleModule2) -set(BUCKET_NAME ExampleModule2_Bucket) +set(LIBRARY_NAME ${MODULE_NAME}) +set(BUCKET_NAME ExampleModule2_bucket) set(LINKDEF src/ExampleLinkDef.h) # needed for the dictionary generation O2_GENERATE_LIBRARY() # todo we repeat ourselves because the above macro dares deleting the variables we pass to it. -set(LIBRARY_NAME ExampleModule2) -set(BUCKET_NAME ExampleModule2_Bucket) +set(LIBRARY_NAME ${MODULE_NAME}) +set(BUCKET_NAME ExampleModule2_bucket) # Define application O2_GENERATE_EXECUTABLE( diff --git a/Examples/flp2epn-distributed/CMakeLists.txt b/Examples/flp2epn-distributed/CMakeLists.txt index 87c1e79e0b59e..c6530da25df35 100644 --- a/Examples/flp2epn-distributed/CMakeLists.txt +++ b/Examples/flp2epn-distributed/CMakeLists.txt @@ -17,11 +17,11 @@ set(HEADERS include/${MODULE_NAME}/EPNReceiver.h) if (DDS_FOUND) - set(BUCKET_NAME flp2epndistrib_Bucket) + set(BUCKET_NAME flp2epndistrib_bucket) else () - set(BUCKET_NAME flp2epn_Bucket) + set(BUCKET_NAME flp2epn_bucket) endif () -set(LIBRARY_NAME FLP2EPNex_distributed) +set(LIBRARY_NAME ${MODULE_NAME}) O2_GENERATE_LIBRARY() @@ -58,11 +58,11 @@ endif () # todo we repeat ourselves because the macro O2_GENERATE_LIBRARY dares deleting the variables we pass to it. if (DDS_FOUND) - set(BUCKET_NAME flp2epndistrib_Bucket) + set(BUCKET_NAME flp2epndistrib_bucket) else () - set(BUCKET_NAME flp2epn_Bucket) + set(BUCKET_NAME flp2epn_bucket) endif () -set(LIBRARY_NAME FLP2EPNex_distributed) +set(LIBRARY_NAME ${MODULE_NAME}) list(LENGTH Exe_Names _length) math(EXPR _length ${_length}-1) diff --git a/Examples/flp2epn/CMakeLists.txt b/Examples/flp2epn/CMakeLists.txt index 7b9258abbfb2d..0ed7edfdcba7a 100644 --- a/Examples/flp2epn/CMakeLists.txt +++ b/Examples/flp2epn/CMakeLists.txt @@ -20,8 +20,8 @@ set(SRCS src/O2Proxy.cxx ) -set(LIBRARY_NAME FLP2EPNex) -set(BUCKET_NAME flp2epn_Bucket) +set(LIBRARY_NAME ${MODULE_NAME}) +set(BUCKET_NAME flp2epn_bucket) O2_GENERATE_LIBRARY() @@ -39,8 +39,8 @@ set(Exe_Source ) # todo we repeat ourselves because the macro O2_GENERATE_LIBRARY dares deleting the variables we pass to it. -set(LIBRARY_NAME FLP2EPNex) -set(BUCKET_NAME flp2epn_Bucket) +set(LIBRARY_NAME ${MODULE_NAME}) +set(BUCKET_NAME flp2epn_bucket) list(LENGTH Exe_Names _length) math(EXPR _length ${_length}-1) diff --git a/Generators/CMakeLists.txt b/Generators/CMakeLists.txt index a3507f25db7cf..bf6c608817b6e 100644 --- a/Generators/CMakeLists.txt +++ b/Generators/CMakeLists.txt @@ -16,8 +16,8 @@ if (PYTHIA8_INCLUDE_DIR) include/Pythia8Generator.h ) - set(LINKDEF src/EventGeneratorLinkDef.h) - set(LIBRARY_NAME EvtGenerator) + set(LINKDEF src/GeneratorsLinkDef.h) + set(LIBRARY_NAME ${MODULE_NAME}) set(BUCKET_NAME generators_bucket) # set(DEPENDENCIES Base O2SimulationDataFormat pythia8 Pythia6) diff --git a/Generators/src/EventGeneratorLinkDef.h b/Generators/src/GeneratorsLinkDef.h similarity index 100% rename from Generators/src/EventGeneratorLinkDef.h rename to Generators/src/GeneratorsLinkDef.h diff --git a/Utilities/QC/CMakeLists.txt b/Utilities/QC/CMakeLists.txt index 2dd9ec338a74e..a46c02babcb1b 100755 --- a/Utilities/QC/CMakeLists.txt +++ b/Utilities/QC/CMakeLists.txt @@ -6,92 +6,3 @@ include_directories(QCCommon/include) add_subdirectory(QCProducer) add_subdirectory(QCMerger) add_subdirectory(QCViewer) -#Set(INCLUDE_DIRECTORIES -# ${ROOT_INCLUDE_DIR} -# ${BASE_INCLUDE_DIRECTORIES} -# ${FAIRROOT_INCLUDE_DIR} -# ${CMAKE_SOURCE_DIR}/Utilities/QC -# ${CMAKE_SOURCE_DIR}/Utilities/QC/Merger -# ${CMAKE_SOURCE_DIR}/Utilities/QC/Producer -# ${CMAKE_SOURCE_DIR}/Utilities/QC/Viewer -#) -# -#Set(SYSTEM_INCLUDE_DIRECTORIES -# ${Boost_INCLUDE_DIR} -# ${ZMQ_INCLUDE_DIR} -#) -# -#Include_Directories(${INCLUDE_DIRECTORIES}) -#Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) -# -#set(LINK_DIRECTORIES -# ${Boost_LIBRARY_DIRS} -# ${FAIRROOT_LIBRARY_DIR} -# ${ROOT_LIBRARY_DIR} -#) -# -#Link_Directories(${LINK_DIRECTORIES}) -# -#set(SRCS -# Producer/src/ProducerDevice.cxx -# Producer/src/HistogramProducer.cxx -# Producer/src/TreeProducer.cxx -# Merger/src/MergerDevice.cxx -# Merger/src/Merger.cxx -# Viewer/src/ViewerDevice.cxx -#) -# -#set(DEPENDENCIES -# ${CMAKE_THREAD_LIBS_INIT} -# ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} -# RIO -# Core -# MathMore -# Net -# Hist -# Tree -# Gpad -#) -# -#set(LIBRARY_NAME o2qaLibrary) -#GENERATE_LIBRARY() -# -#Set(Exe_Names -# runMergerDevice -# runProducer -# runViewerDevice -#) -# -#Set(Exe_Source -# Merger/src/runMerger.cxx -# Producer/src/runProducer.cxx -# Viewer/src/runViewerDevice.cxx -#) -# -#list(LENGTH Exe_Names _length) -#math(EXPR _length ${_length}-1) -# -#ForEach(_file RANGE 0 ${_length}) -# list(GET Exe_Names ${_file} _name) -# list(GET Exe_Source ${_file} _src) -# set(EXE_NAME ${_name}) -# set(SRCS ${_src}) -# set(DEPENDENCIES dl Core Base Hist o2qaLibrary FairMQ pthread fairmq_logger ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ) -# GENERATE_EXECUTABLE() -#EndForEach(_file RANGE 0 ${_length}) -# -#ENABLE_TESTING() -#ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK) -#SET(EXECUTABLE_PATH ${CMAKE_BINARY_DIR}/bin) -# -#add_executable(testQaProducer Producer/test/ProducerTestSuite.cxx) -#add_executable(testQaMerger Merger/test/MergerTestSuite.cxx) -#add_executable(testQaViewer Viewer/test/ViewerTestSuite.cxx) -# -#target_link_libraries(testQaProducer dl Core Base Hist o2qaLibrary FairMQ ${Boost_SYSTEM_LIBRARY} ) -#target_link_libraries(testQaMerger dl Core Base Hist o2qaLibrary FairMQ ${Boost_SYSTEM_LIBRARY} ) -#target_link_libraries(testQaViewer dl Core Base Hist o2qaLibrary FairMQ ${Boost_SYSTEM_LIBRARY} ) -# -#add_test(ProducerTest ${EXECUTABLE_PATH}/testQaProducer) -#add_test(MergerTest ${EXECUTABLE_PATH}/testQaMerger) -#add_test(ViewerTest ${EXECUTABLE_PATH}/testQaViewer) diff --git a/Utilities/hough/CMakeLists.txt b/Utilities/hough/CMakeLists.txt index 84b31ec4242ab..1c2aebd0c107e 100644 --- a/Utilities/hough/CMakeLists.txt +++ b/Utilities/hough/CMakeLists.txt @@ -10,7 +10,7 @@ set(Exe_Source runHough.cxx ) -set(BUCKET_NAME hough_Bucket) +set(BUCKET_NAME hough_bucket) list(LENGTH Exe_Names _length) math(EXPR _length ${_length}-1) diff --git a/cmake/O2Dependencies.cmake b/cmake/O2Dependencies.cmake index eb56307851fa5..6e0d7cd0553f3 100644 --- a/cmake/O2Dependencies.cmake +++ b/cmake/O2Dependencies.cmake @@ -58,7 +58,7 @@ endif() o2_define_bucket( NAME - ExampleModule1_Bucket + ExampleModule1_bucket DEPENDENCIES # library names ${Boost_PROGRAM_OPTIONS_LIBRARY} @@ -69,11 +69,11 @@ o2_define_bucket( o2_define_bucket( NAME - ExampleModule2_Bucket + ExampleModule2_bucket DEPENDENCIES # library names ExampleModule1 # another module - ExampleModule1_Bucket # another bucket + ExampleModule1_bucket # another bucket Core Hist # ROOT INCLUDE_DIRECTORIES @@ -83,7 +83,7 @@ o2_define_bucket( o2_define_bucket( NAME - flp2epn_Bucket + flp2epn_bucket DEPENDENCIES ${Boost_CHRONO_LIBRARY} @@ -105,10 +105,10 @@ o2_define_bucket( o2_define_bucket( NAME - flp2epndistrib_Bucket + flp2epndistrib_bucket DEPENDENCIES - flp2epn_Bucket + flp2epn_bucket dds-key-value-lib INCLUDE_DIRECTORIES @@ -142,7 +142,7 @@ o2_define_bucket( o2_define_bucket( NAME - CCDB_Bucket + CCDB_bucket DEPENDENCIES ${Boost_PROGRAM_OPTIONS_LIBRARY} @@ -247,7 +247,7 @@ o2_define_bucket( fairroot_base_bucket root_physics_bucket ParBase - itsBase + ITSBase DetectorsBase SimulationDataFormat @@ -257,10 +257,10 @@ o2_define_bucket( o2_define_bucket( NAME - itsmft_test + hitanalysis_bucket DEPENDENCIES - itsSimulation + ITSSimulation INCLUDE_DIRECTORIES ${FAIRROOT_INCLUDE_DIR} @@ -386,7 +386,7 @@ o2_define_bucket( fairroot_geom MathCore RIO - TPCbase + TPCBase DetectorsBase SimulationDataFormat @@ -439,7 +439,7 @@ o2_define_bucket( o2_define_bucket( NAME - hough_Bucket + hough_bucket DEPENDENCIES Core RIO Gpad Hist HLTbase AliHLTUtil AliHLTTPC AliHLTUtil diff --git a/cmake/O2Utils.cmake b/cmake/O2Utils.cmake index 9503285c56dc0..c56f66b921781 100644 --- a/cmake/O2Utils.cmake +++ b/cmake/O2Utils.cmake @@ -41,8 +41,8 @@ function(O2_DEFINE_BUCKET) # endforeach () # Save this information - set("Bucket_map_libs_${PARSED_ARGS_NAME}" "${PARSED_ARGS_DEPENDENCIES}" PARENT_SCOPE) # emulation of a map - set("Bucket_map_inc_dirs_${PARSED_ARGS_NAME}" "${PARSED_ARGS_INCLUDE_DIRECTORIES}" PARENT_SCOPE) # emulation of a map + set("bucket_map_libs_${PARSED_ARGS_NAME}" "${PARSED_ARGS_DEPENDENCIES}" PARENT_SCOPE) # emulation of a map + set("bucket_map_inc_dirs_${PARSED_ARGS_NAME}" "${PARSED_ARGS_INCLUDE_DIRECTORIES}" PARENT_SCOPE) # emulation of a map endfunction() macro(INDENT NUMBER_SPACES INDENTATION) @@ -76,21 +76,21 @@ function(GET_BUCKET_CONTENT message(FATAL_ERROR "It seems that you have a loop in your bucket definitions. Aborted.") endif () INDENT(${DEPTH} INDENTATION) - if (NOT DEFINED Bucket_map_libs_${BUCKET_NAME}) - message(FATAL_ERROR "${INDENTATION}Bucket ${BUCKET_NAME} not defined. Use o2_define_bucket to define it.") + if (NOT DEFINED bucket_map_libs_${BUCKET_NAME}) + message(FATAL_ERROR "${INDENTATION}bucket ${BUCKET_NAME} not defined. Use o2_define_bucket to define it.") endif () message("${INDENTATION}Get content of bucket ${BUCKET_NAME}") # Fetch the content (recursively) - set(libs ${Bucket_map_libs_${BUCKET_NAME}}) - set(inc_dirs ${Bucket_map_inc_dirs_${BUCKET_NAME}}) + set(libs ${bucket_map_libs_${BUCKET_NAME}}) + set(inc_dirs ${bucket_map_inc_dirs_${BUCKET_NAME}}) set(LOCAL_RESULT_libs_${DEPTH} "") set(LOCAL_RESULT_inc_dirs_${DEPTH} "") foreach (dependency ${libs}) # message("${INDENTATION}- ${dependency} (lib or bucket)") # if it is a bucket we call recursively - if (DEFINED Bucket_map_libs_${dependency}) + if (DEFINED bucket_map_libs_${dependency}) MATH(EXPR new_depth "${DEPTH}+1") GET_BUCKET_CONTENT(${dependency} LOCAL_RESULT_libs_${DEPTH} @@ -131,8 +131,8 @@ function(O2_TARGET_LINK_BUCKET) # message(STATUS "Add dependency bucket for target ${PARSED_ARGS_TARGET} : ${PARSED_ARGS_BUCKET}") # find the bucket - if (NOT DEFINED Bucket_map_libs_${PARSED_ARGS_BUCKET}) - message(FATAL_ERROR "Bucket ${PARSED_ARGS_BUCKET} not defined. + if (NOT DEFINED bucket_map_libs_${PARSED_ARGS_BUCKET}) + message(FATAL_ERROR "bucket ${PARSED_ARGS_BUCKET} not defined. Use o2_define_bucket to define it.") endif () @@ -143,7 +143,7 @@ function(O2_TARGET_LINK_BUCKET) message(STATUS "All inc_dirs of the bucket ${PARSED_ARGS_BUCKET} : ${RESULT_inc_dirs}") # for each dependency in the bucket invoke target_link_library - # set(DEPENDENCIES ${Bucket_map_libs_${PARSED_ARGS_BUCKET}}) + # set(DEPENDENCIES ${bucket_map_libs_${PARSED_ARGS_BUCKET}}) # message(STATUS " invoke target_link_libraries for target ${PARSED_ARGS_TARGET} : ${RESULT_libs} ${PARSED_ARGS_MODULE_LIBRARY_NAME}") target_link_libraries(${PARSED_ARGS_TARGET} ${RESULT_libs} ${PARSED_ARGS_MODULE_LIBRARY_NAME}) # Same thing for lib_dirs and inc_dirs diff --git a/docs/doxygen/CMakeInstructions.md b/docs/doxygen/CMakeInstructions.md index 6ece48627747e..07aea8a848e0c 100644 --- a/docs/doxygen/CMakeInstructions.md +++ b/docs/doxygen/CMakeInstructions.md @@ -38,7 +38,7 @@ A sub-module CMakeLists.txt minimally contains (see Examples/ExampleModule1) * The setup the system : `O2_SETUP(NAME My_Module)` * The list of the source files in the variable SRC : `set(SRCS something.cxx)` * The name of the library : `set(LIBRARY_NAME My_Module)` -* The name of the dependency bucket to use : `set(BUCKET_NAME My_Bucket)` +* The name of the dependency bucket to use : `set(BUCKET_NAME My_bucket)` * The call to generate the library : `O2_GENERATE_LIBRARY()` Optionally it contains (see Examples/ExampleModule2) @@ -51,7 +51,7 @@ Optionally it contains (see Examples/ExampleModule2) * Again the name of the library and bucket_name because they got erased by `O2_GENERATE_LIBRARY()` ``` set(LIBRARY_NAME ExampleModule2) - set(BUCKET_NAME ExampleModule2_Bucket) + set(BUCKET_NAME ExampleModule2_bucket) ``` * The call to generate the executable : ``` @@ -67,12 +67,12 @@ If a new bucket is needed, it should be defined in cmake/O2Dependencies.cmake us ``` o2_define_bucket( NAME - ExampleModule2_Bucket + ExampleModule2_bucket DEPENDENCIES ${Boost_PROGRAM_OPTIONS_LIBRARY} # a library ExampleModule1 # another module - ExampleModule1_Bucket # another bucket + ExampleModule1_bucket # another bucket INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR} # another lib include dir diff --git a/itsmft/its/CMakeLists.txt b/itsmft/its/CMakeLists.txt deleted file mode 100644 index 72c19feca5171..0000000000000 --- a/itsmft/its/CMakeLists.txt +++ /dev/null @@ -1,56 +0,0 @@ -set(INCLUDE_DIRECTORIES -${CMAKE_SOURCE_DIR} -${CMAKE_SOURCE_DIR}/itsmft/its -${CMAKE_SOURCE_DIR}/header -) - -set(SYSTEM_INCLUDE_DIRECTORIES -${CMAKE_SOURCE_DIR} -${CMAKE_SOURCE_DIR}/itsmft/its -${CMAKE_SOURCE_DIR}/header -${BASE_INCLUDE_DIRECTORIES} -${Boost_INCLUDE_DIRS} -${FAIRROOT_INCLUDE_DIR} -${ROOT_INCLUDE_DIR} -) - -include_directories( ${INCLUDE_DIRECTORIES}) -include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) - -set(LINK_DIRECTORIES -${ROOT_LIBRARY_DIR} -${FAIRROOT_LIBRARY_DIR} -) - -link_directories( ${LINK_DIRECTORIES}) - -set(SRCS -UpgradeGeometryTGeo.cxx -V11Geometry.cxx -UpgradeV1Layer.cxx -Segmentation.cxx -UpgradeSegmentationPixel.cxx -GeometryManager.cxx -Detector.cxx -ContainerFactory.cxx -GeometryHandler.cxx -MisalignmentParameter.cxx -Point.cxx -Chip.cxx -Digit.cxx -Digitizer.cxx -DigitizerTask.cxx -DigitWriteoutBuffer.cxx -DigitContainer.cxx -DigitLayer.cxx -DigitStave.cxx -) - -Set(LINKDEF itsLinkDef.h) -Set(LIBRARY_NAME its) -Set(DEPENDENCIES - Base - AliceO2Base -) - -GENERATE_LIBRARY() diff --git a/macro/load_all_libs.C b/macro/load_all_libs.C index 45aa56ee1e099..2bb91713b0af7 100644 --- a/macro/load_all_libs.C +++ b/macro/load_all_libs.C @@ -11,11 +11,10 @@ void load_all_libs() gSystem->Load("libEvtGenerator"); gSystem->Load("libPassive"); gSystem->Load("libRoundtripTest"); - gSystem->Load("libits"); - gSystem->Load("libitsBase"); + gSystem->Load("libITSBase"); gSystem->Load("libSimulation"); - gSystem->Load("libtpcBase"); - gSystem->Load("libtpcSimulation"); + gSystem->Load("libTPCBase"); + gSystem->Load("libTPCSimulation"); gSystem->Load("libo2qaLibrary"); cout << endl << endl; cout << "Macro finished succesfully." << endl; diff --git a/o2cdb/CMakeLists.txt b/o2cdb/CMakeLists.txt deleted file mode 100644 index 85cbfc1c93d46..0000000000000 --- a/o2cdb/CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ -configure_file(${CMAKE_SOURCE_DIR}/o2cdb/conditions-server.json ${CMAKE_BINARY_DIR}/bin/config/conditions-server.json) -configure_file(${CMAKE_SOURCE_DIR}/o2cdb/conditions-client.json ${CMAKE_BINARY_DIR}/bin/config/conditions-client.json) -configure_file(${CMAKE_SOURCE_DIR}/o2cdb/fill_local_ocdb.C ${CMAKE_BINARY_DIR}/bin/config/fill_local_ocdb.C) - -set(INCLUDE_DIRECTORIES - ${BASE_INCLUDE_DIRECTORIES} - ${Boost_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/o2cdb -) - -set(SYSTEM_INCLUDE_DIRECTORIES - ${BASE_INCLUDE_DIRECTORIES} - ${Boost_INCLUDE_DIR} - ${ROOT_INCLUDE_DIR} - ${FAIRROOT_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} -) - -include_directories(${INCLUDE_DIRECTORIES}) -include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) - -set(LINK_DIRECTORIES - ${ROOT_LIBRARY_DIR} - ${Boost_LIBRARY_DIRS} - ${FAIRROOT_LIBRARY_DIR} -) -link_directories(${LINK_DIRECTORIES}) - -set(SRCS - Manager.cxx - Condition.cxx - GridStorage.cxx - LocalStorage.cxx - FileStorage.cxx - ConditionMetaData.cxx - ConditionId.cxx - IdPath.cxx - IdRunRange.cxx - Storage.cxx - XmlHandler.cxx -) - -Set(NO_DICT_SRCS - ConditionsMQServer.cxx - ConditionsMQClient.cxx -) - -set(DEPENDENCIES - Base ParBase FairMQ ParMQ ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${Boost_SYSTEM_LIBRARY} ${Boost_LOG_LIBRARY} ${Boost_LOG_SETUP_LIBRARY} fairmq_logger pthread Core - Tree XMLParser Hist FairTools -) - -set(LIBRARY_NAME AliceO2Cdb) -set(LINKDEF O2CdbLinkDef.h) -GENERATE_LIBRARY() - -Set(Exe_Names - conditions-server - conditions-client -) - -Set(Exe_Source - runConditionsServer.cxx - runConditionsClient.cxx -) - -list(LENGTH Exe_Names _length) -math(EXPR _length ${_length}-1) - -ForEach(_file RANGE 0 ${_length}) - list(GET Exe_Names ${_file} _name) - list(GET Exe_Source ${_file} _src) - Set(EXE_NAME ${_name}) - Set(SRCS ${_src}) - Set(DEPENDENCIES AliceO2Cdb) - GENERATE_EXECUTABLE() -EndForEach(_file RANGE 0 ${_length})