From 3c77e1effac90fffac9495e3e20a7ecdac760779 Mon Sep 17 00:00:00 2001 From: agrigora Date: Thu, 13 Nov 2014 16:32:45 +0100 Subject: [PATCH] MONITOR without ZEROMQ --- AD/{ => ADbase}/AliADDataDCS.h | 0 AD/{ => ADbase}/AliADPreprocessor.h | 0 ANALYSIS/ANALYSIS/AliAnalysisManager.cxx | 2 +- ANALYSIS/ANALYSIS/CMakeLists.txt | 3 +- CMakeLists.txt | 4 + HLT/ITS/CMakeLists.txt | 3 +- HLT/global/CMakeLists.txt | 8 +- MONITOR/CMakeLists.txt | 4 +- .../{ => MONITOR}/AliChildProcTerminator.cxx | 0 .../{ => MONITOR}/AliChildProcTerminator.h | 0 MONITOR/{ => MONITOR}/AliDimIntNotifier.cxx | 0 MONITOR/{ => MONITOR}/AliDimIntNotifier.h | 0 .../{ => MONITOR}/AliOnlineRecoTrigger.cxx | 0 MONITOR/{ => MONITOR}/AliOnlineRecoTrigger.h | 0 MONITOR/{ => MONITOR}/AliQAHistNavigator.cxx | 0 MONITOR/{ => MONITOR}/AliQAHistNavigator.h | 0 MONITOR/{ => MONITOR}/AliQAHistViewer.cxx | 0 MONITOR/{ => MONITOR}/AliQAHistViewer.h | 0 .../AliTestChildProc.cxx | 0 .../AliTestChildProc.h | 0 MONITOR/MONITOR/CMakeLists.txt | 80 ++++++++++++++++ MONITOR/{ => MONITOR}/MONITORLinkDef.h | 0 MONITOR/{ => MONITOR}/SORNotifier.cxx | 0 MONITOR/{ => MONITOR}/SORNotifier.h | 0 .../AliCommunicationThread.cxx | 0 .../AliCommunicationThread.h | 0 .../AliDIMListenerThread.cxx | 0 .../AliDIMListenerThread.h | 0 .../AliEventsCollectorThread.cxx | 0 .../AliEventsCollectorThread.h | 0 .../AliOnlineReconstruction.cxx | 0 .../AliOnlineReconstruction.h | 0 .../AliStorageAdministratorPanel.cxx | 0 .../AliStorageAdministratorPanel.h | 0 ...AliStorageAdministratorPanelListEvents.cxx | 0 .../AliStorageAdministratorPanelListEvents.h | 0 .../AliStorageAdministratorPanelMarkEvent.cxx | 0 .../AliStorageAdministratorPanelMarkEvent.h | 0 ...rageAdministratorPanelSetStorageParams.cxx | 0 ...torageAdministratorPanelSetStorageParams.h | 0 .../AliStorageClientThread.cxx | 0 .../AliStorageClientThread.h | 0 .../AliStorageDatabase.cxx | 0 .../AliStorageDatabase.h | 0 .../AliStorageEventManager.cxx | 0 .../AliStorageEventManager.h | 0 .../AliStorageServerThread.cxx | 0 .../AliStorageServerThread.h | 0 MONITOR/MONITORzmq/CMakeLists.txt | 91 +++++++++++++++++++ MONITOR/{ => MONITORzmq}/MONITORzmqLinkDef.h | 0 MONITOR/alitestproc/CMakeLists.txt | 52 +++++++++++ MONITOR/deroot/CMakeLists.txt | 51 +++++++++++ MONITOR/monitorCheck/CMakeLists.txt | 52 +++++++++++ MONITOR/monitorGDC/CMakeLists.txt | 52 +++++++++++ STEER/STEER/CMakeLists.txt | 5 +- TPC/TPCcalib/CMakeLists.txt | 4 +- 56 files changed, 399 insertions(+), 12 deletions(-) rename AD/{ => ADbase}/AliADDataDCS.h (100%) rename AD/{ => ADbase}/AliADPreprocessor.h (100%) rename MONITOR/{ => MONITOR}/AliChildProcTerminator.cxx (100%) rename MONITOR/{ => MONITOR}/AliChildProcTerminator.h (100%) rename MONITOR/{ => MONITOR}/AliDimIntNotifier.cxx (100%) rename MONITOR/{ => MONITOR}/AliDimIntNotifier.h (100%) rename MONITOR/{ => MONITOR}/AliOnlineRecoTrigger.cxx (100%) rename MONITOR/{ => MONITOR}/AliOnlineRecoTrigger.h (100%) rename MONITOR/{ => MONITOR}/AliQAHistNavigator.cxx (100%) rename MONITOR/{ => MONITOR}/AliQAHistNavigator.h (100%) rename MONITOR/{ => MONITOR}/AliQAHistViewer.cxx (100%) rename MONITOR/{ => MONITOR}/AliQAHistViewer.h (100%) rename MONITOR/{alitestproc => MONITOR}/AliTestChildProc.cxx (100%) rename MONITOR/{alitestproc => MONITOR}/AliTestChildProc.h (100%) create mode 100644 MONITOR/MONITOR/CMakeLists.txt rename MONITOR/{ => MONITOR}/MONITORLinkDef.h (100%) rename MONITOR/{ => MONITOR}/SORNotifier.cxx (100%) rename MONITOR/{ => MONITOR}/SORNotifier.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliCommunicationThread.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliCommunicationThread.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliDIMListenerThread.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliDIMListenerThread.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliEventsCollectorThread.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliEventsCollectorThread.h (100%) rename MONITOR/{alionlinereco => MONITORzmq}/AliOnlineReconstruction.cxx (100%) rename MONITOR/{alionlinereco => MONITORzmq}/AliOnlineReconstruction.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanel.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanel.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanelListEvents.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanelListEvents.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanelMarkEvent.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanelMarkEvent.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanelSetStorageParams.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageAdministratorPanelSetStorageParams.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageClientThread.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageClientThread.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageDatabase.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageDatabase.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageEventManager.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageEventManager.h (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageServerThread.cxx (100%) rename MONITOR/{alistoragemanager => MONITORzmq}/AliStorageServerThread.h (100%) create mode 100644 MONITOR/MONITORzmq/CMakeLists.txt rename MONITOR/{ => MONITORzmq}/MONITORzmqLinkDef.h (100%) create mode 100644 MONITOR/alitestproc/CMakeLists.txt create mode 100644 MONITOR/deroot/CMakeLists.txt create mode 100644 MONITOR/monitorCheck/CMakeLists.txt create mode 100644 MONITOR/monitorGDC/CMakeLists.txt diff --git a/AD/AliADDataDCS.h b/AD/ADbase/AliADDataDCS.h similarity index 100% rename from AD/AliADDataDCS.h rename to AD/ADbase/AliADDataDCS.h diff --git a/AD/AliADPreprocessor.h b/AD/ADbase/AliADPreprocessor.h similarity index 100% rename from AD/AliADPreprocessor.h rename to AD/ADbase/AliADPreprocessor.h diff --git a/ANALYSIS/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/ANALYSIS/AliAnalysisManager.cxx index b2bc358f9f5..3793aeccd97 100644 --- a/ANALYSIS/ANALYSIS/AliAnalysisManager.cxx +++ b/ANALYSIS/ANALYSIS/AliAnalysisManager.cxx @@ -55,7 +55,7 @@ #include "AliSysInfo.h" #include "AliAnalysisStatistics.h" #include "AliVEvent.h" -#include "AliHLTTestInputHandler.h" +//#include "AliHLTTestInputHandler.h" using std::ofstream; using std::ios; diff --git a/ANALYSIS/ANALYSIS/CMakeLists.txt b/ANALYSIS/ANALYSIS/CMakeLists.txt index a4dc248899b..c5ac666907d 100644 --- a/ANALYSIS/ANALYSIS/CMakeLists.txt +++ b/ANALYSIS/ANALYSIS/CMakeLists.txt @@ -46,11 +46,12 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") # Generate the ROOT map # Dependecies -set(LIBDEPS STEERBase Core Gpad Hist Net RIO Tree XMLParser) +set(LIBDEPS STEERBase STEER Core Gpad Hist Net RIO Tree XMLParser) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") # Add a library to the project using the specified source files add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) +target_link_libraries(${MODULE} STEERBase Core Gpad Hist Net RIO Tree XMLParser) # Additional compilation flags set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") diff --git a/CMakeLists.txt b/CMakeLists.txt index 65f8a881bb7..b6656af80b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,9 @@ find_package(DATE) # FastJet find_package(FASTJET) +# ZEROMQ +find_package(ZeroMQ) + # AliRoot version extracted from Git repository # Sets 4 git variables # - GIT_REFSPEC - complete name of the current reference @@ -131,6 +134,7 @@ add_subdirectory(HLT) add_subdirectory(STARLIGHT) add_subdirectory(EVE) add_subdirectory(AD) +add_subdirectory(MONITOR) # Enable SHUTTLE compilation # Check if DIMDIR and ODIR are set diff --git a/HLT/ITS/CMakeLists.txt b/HLT/ITS/CMakeLists.txt index abc65e00ad1..0b5d66eaaba 100644 --- a/HLT/ITS/CMakeLists.txt +++ b/HLT/ITS/CMakeLists.txt @@ -18,8 +18,9 @@ set(MODULE AliHLTITS) # Module include folder include_directories(${AliRoot_SOURCE_DIR}/HLT/ITS - ${AliRoot_SOURCE_DIR}/HLT/ITS/tracking ${AliRoot_SOURCE_DIR}/HLT/ITS/clusterfinders + ${AliRoot_SOURCE_DIR}/HLT/ITS/tracking + ${AliRoot_SOURCE_DIR}/HLT/ITS/trackingSAP ) # Additional include folders in alphabetical order except ROOT diff --git a/HLT/global/CMakeLists.txt b/HLT/global/CMakeLists.txt index 46145adb619..5645147a764 100644 --- a/HLT/global/CMakeLists.txt +++ b/HLT/global/CMakeLists.txt @@ -24,13 +24,17 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/global # Additional include folders in alphabetical order except ROOT include_directories(${ROOT_INCLUDE_DIRS} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice + ${AliRoot_SOURCE_DIR}/ITS/ITSrec ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/util ${AliRoot_SOURCE_DIR}/HLT/ITS + ${AliRoot_SOURCE_DIR}/HLT/TPCLib + ${AliRoot_SOURCE_DIR}/ITS/ITSbase ${AliRoot_SOURCE_DIR}/STEER/CDB ${AliRoot_SOURCE_DIR}/STEER/ESD ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase + ${AliRoot_SOURCE_DIR}/TPC/TPCrec ) # Sources in alphabetical order @@ -72,12 +76,12 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") # Generate the ROOT map # Dependecies -set(LIBDEPS STEERBase STEER ESD CDB ANALYSISalice HLTbase AliHLTUtil AliHLTITS) +set(LIBDEPS STEERBase STEER ESD CDB ANALYSISalice HLTbase AliHLTUtil AliHLTITS AliHLTTPC TPCrec ITSbase ITSrec) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") # Add a library to the project using the specified source files add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) -target_link_libraries(${MODULE} STEERBase STEER ESD CDB ANALYSISalice HLTbase AliHLTUtil AliHLTITS) +target_link_libraries(${MODULE} STEERBase STEER ESD CDB ANALYSISalice AliHLTTPC HLTbase AliHLTUtil AliHLTITS TPCrec ITSbase ITSrec) # Additional compilation flags set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") diff --git a/MONITOR/CMakeLists.txt b/MONITOR/CMakeLists.txt index 138d65e2ab6..04e6414a5e2 100644 --- a/MONITOR/CMakeLists.txt +++ b/MONITOR/CMakeLists.txt @@ -22,7 +22,7 @@ add_subdirectory(deroot) add_subdirectory(monitorCheck) add_subdirectory(monitorGDC) -#if(ZEROMQ_FOUND) +if(ZEROMQ_FOUND) add_subdirectory(MONITORzmq) # alistoragemanager/CMakebinalistorage.pkg # alistoragemanager/CMakebinalistorageadmin.pkg @@ -30,7 +30,7 @@ add_subdirectory(monitorGDC) # alistoragemanager/CMakebinalistorageminimalexample.pkg # alistoragemanager/CMakebinalistoragegetpoints.pkg # alieventserver/CMakebinalieventserver.pkg -#endif(ZEROMQ_FOUND) +endif(ZEROMQ_FOUND) message(STATUS "MONITOR enabled") diff --git a/MONITOR/AliChildProcTerminator.cxx b/MONITOR/MONITOR/AliChildProcTerminator.cxx similarity index 100% rename from MONITOR/AliChildProcTerminator.cxx rename to MONITOR/MONITOR/AliChildProcTerminator.cxx diff --git a/MONITOR/AliChildProcTerminator.h b/MONITOR/MONITOR/AliChildProcTerminator.h similarity index 100% rename from MONITOR/AliChildProcTerminator.h rename to MONITOR/MONITOR/AliChildProcTerminator.h diff --git a/MONITOR/AliDimIntNotifier.cxx b/MONITOR/MONITOR/AliDimIntNotifier.cxx similarity index 100% rename from MONITOR/AliDimIntNotifier.cxx rename to MONITOR/MONITOR/AliDimIntNotifier.cxx diff --git a/MONITOR/AliDimIntNotifier.h b/MONITOR/MONITOR/AliDimIntNotifier.h similarity index 100% rename from MONITOR/AliDimIntNotifier.h rename to MONITOR/MONITOR/AliDimIntNotifier.h diff --git a/MONITOR/AliOnlineRecoTrigger.cxx b/MONITOR/MONITOR/AliOnlineRecoTrigger.cxx similarity index 100% rename from MONITOR/AliOnlineRecoTrigger.cxx rename to MONITOR/MONITOR/AliOnlineRecoTrigger.cxx diff --git a/MONITOR/AliOnlineRecoTrigger.h b/MONITOR/MONITOR/AliOnlineRecoTrigger.h similarity index 100% rename from MONITOR/AliOnlineRecoTrigger.h rename to MONITOR/MONITOR/AliOnlineRecoTrigger.h diff --git a/MONITOR/AliQAHistNavigator.cxx b/MONITOR/MONITOR/AliQAHistNavigator.cxx similarity index 100% rename from MONITOR/AliQAHistNavigator.cxx rename to MONITOR/MONITOR/AliQAHistNavigator.cxx diff --git a/MONITOR/AliQAHistNavigator.h b/MONITOR/MONITOR/AliQAHistNavigator.h similarity index 100% rename from MONITOR/AliQAHistNavigator.h rename to MONITOR/MONITOR/AliQAHistNavigator.h diff --git a/MONITOR/AliQAHistViewer.cxx b/MONITOR/MONITOR/AliQAHistViewer.cxx similarity index 100% rename from MONITOR/AliQAHistViewer.cxx rename to MONITOR/MONITOR/AliQAHistViewer.cxx diff --git a/MONITOR/AliQAHistViewer.h b/MONITOR/MONITOR/AliQAHistViewer.h similarity index 100% rename from MONITOR/AliQAHistViewer.h rename to MONITOR/MONITOR/AliQAHistViewer.h diff --git a/MONITOR/alitestproc/AliTestChildProc.cxx b/MONITOR/MONITOR/AliTestChildProc.cxx similarity index 100% rename from MONITOR/alitestproc/AliTestChildProc.cxx rename to MONITOR/MONITOR/AliTestChildProc.cxx diff --git a/MONITOR/alitestproc/AliTestChildProc.h b/MONITOR/MONITOR/AliTestChildProc.h similarity index 100% rename from MONITOR/alitestproc/AliTestChildProc.h rename to MONITOR/MONITOR/AliTestChildProc.h diff --git a/MONITOR/MONITOR/CMakeLists.txt b/MONITOR/MONITOR/CMakeLists.txt new file mode 100644 index 00000000000..80879d82f4e --- /dev/null +++ b/MONITOR/MONITOR/CMakeLists.txt @@ -0,0 +1,80 @@ +# ************************************************************************** +# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. * +# * * +# * Author: The ALICE Off-line Project. * +# * Contributors are mentioned in the code where appropriate. * +# * * +# * Permission to use, copy, modify and distribute this software and its * +# * documentation strictly for non-commercial purposes is hereby granted * +# * without fee, provided that the above copyright notice appears in all * +# * copies and that both the copyright notice and this permission notice * +# * appear in the supporting documentation. The authors make no claims * +# * about the suitability of this software for any purpose. It is * +# * provided "as is" without express or implied warranty. * +# ************************************************************************** + +# Module +set(MODULE MONITOR) + +# Module include folder +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/${MODULE} + ${AliRoot_SOURCE_DIR}/MONITOR/alistoragemanager + ) + +# Additional include folders in alphabetical order +include_directories(${AliRoot_SOURCE_DIR}/STEER/STEERBase + ) + +# Sources in alphabetical order +set(SRCS + AliChildProcTerminator.cxx + AliDimIntNotifier.cxx + AliOnlineRecoTrigger.cxx + AliQAHistNavigator.cxx + AliQAHistViewer.cxx + AliTestChildProc.cxx + ) + +if(DIMDIR AND ODIR) + set(SRCS ${SRCS} + SORNotifier.cxx + ) + include_directories(${DIMDIR}/dim) + link_directories(${DIMDIR}/${ODIR}) + add_definitions(-DALI_DIM) +endif() + +# Headers from sources +string(REPLACE ".cxx" ".h" HDRS "${SRCS}") + +# Generate the dictionary +# It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument +get_directory_property(incdirs INCLUDE_DIRECTORIES) +generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") + +# Generate the ROOT map +# Dependecies +set(LIBDEPS STEERBase Core Gpad Graf Gui Hist RIO Thread) +generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") + +# Add a library to the project using the specified source files +add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) +target_link_libraries(${MODULE} STEERBase Core Gpad Graf Gui Hist RIO Thread) +if(DIMDIR AND ODIR) + target_link_libraries(${MODULE} dim) +endif() + +# Additional compilation flags +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") + +# System dependent: Modify the way the library is build +if(${CMAKE_SYSTEM} MATCHES Darwin) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") +endif(${CMAKE_SYSTEM} MATCHES Darwin) + +# Installation +install(TARGETS ${MODULE} + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(FILES ${HDRS} DESTINATION include) \ No newline at end of file diff --git a/MONITOR/MONITORLinkDef.h b/MONITOR/MONITOR/MONITORLinkDef.h similarity index 100% rename from MONITOR/MONITORLinkDef.h rename to MONITOR/MONITOR/MONITORLinkDef.h diff --git a/MONITOR/SORNotifier.cxx b/MONITOR/MONITOR/SORNotifier.cxx similarity index 100% rename from MONITOR/SORNotifier.cxx rename to MONITOR/MONITOR/SORNotifier.cxx diff --git a/MONITOR/SORNotifier.h b/MONITOR/MONITOR/SORNotifier.h similarity index 100% rename from MONITOR/SORNotifier.h rename to MONITOR/MONITOR/SORNotifier.h diff --git a/MONITOR/alistoragemanager/AliCommunicationThread.cxx b/MONITOR/MONITORzmq/AliCommunicationThread.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliCommunicationThread.cxx rename to MONITOR/MONITORzmq/AliCommunicationThread.cxx diff --git a/MONITOR/alistoragemanager/AliCommunicationThread.h b/MONITOR/MONITORzmq/AliCommunicationThread.h similarity index 100% rename from MONITOR/alistoragemanager/AliCommunicationThread.h rename to MONITOR/MONITORzmq/AliCommunicationThread.h diff --git a/MONITOR/alistoragemanager/AliDIMListenerThread.cxx b/MONITOR/MONITORzmq/AliDIMListenerThread.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliDIMListenerThread.cxx rename to MONITOR/MONITORzmq/AliDIMListenerThread.cxx diff --git a/MONITOR/alistoragemanager/AliDIMListenerThread.h b/MONITOR/MONITORzmq/AliDIMListenerThread.h similarity index 100% rename from MONITOR/alistoragemanager/AliDIMListenerThread.h rename to MONITOR/MONITORzmq/AliDIMListenerThread.h diff --git a/MONITOR/alistoragemanager/AliEventsCollectorThread.cxx b/MONITOR/MONITORzmq/AliEventsCollectorThread.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliEventsCollectorThread.cxx rename to MONITOR/MONITORzmq/AliEventsCollectorThread.cxx diff --git a/MONITOR/alistoragemanager/AliEventsCollectorThread.h b/MONITOR/MONITORzmq/AliEventsCollectorThread.h similarity index 100% rename from MONITOR/alistoragemanager/AliEventsCollectorThread.h rename to MONITOR/MONITORzmq/AliEventsCollectorThread.h diff --git a/MONITOR/alionlinereco/AliOnlineReconstruction.cxx b/MONITOR/MONITORzmq/AliOnlineReconstruction.cxx similarity index 100% rename from MONITOR/alionlinereco/AliOnlineReconstruction.cxx rename to MONITOR/MONITORzmq/AliOnlineReconstruction.cxx diff --git a/MONITOR/alionlinereco/AliOnlineReconstruction.h b/MONITOR/MONITORzmq/AliOnlineReconstruction.h similarity index 100% rename from MONITOR/alionlinereco/AliOnlineReconstruction.h rename to MONITOR/MONITORzmq/AliOnlineReconstruction.h diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanel.cxx b/MONITOR/MONITORzmq/AliStorageAdministratorPanel.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanel.cxx rename to MONITOR/MONITORzmq/AliStorageAdministratorPanel.cxx diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanel.h b/MONITOR/MONITORzmq/AliStorageAdministratorPanel.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanel.h rename to MONITOR/MONITORzmq/AliStorageAdministratorPanel.h diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanelListEvents.cxx b/MONITOR/MONITORzmq/AliStorageAdministratorPanelListEvents.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanelListEvents.cxx rename to MONITOR/MONITORzmq/AliStorageAdministratorPanelListEvents.cxx diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanelListEvents.h b/MONITOR/MONITORzmq/AliStorageAdministratorPanelListEvents.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanelListEvents.h rename to MONITOR/MONITORzmq/AliStorageAdministratorPanelListEvents.h diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanelMarkEvent.cxx b/MONITOR/MONITORzmq/AliStorageAdministratorPanelMarkEvent.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanelMarkEvent.cxx rename to MONITOR/MONITORzmq/AliStorageAdministratorPanelMarkEvent.cxx diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanelMarkEvent.h b/MONITOR/MONITORzmq/AliStorageAdministratorPanelMarkEvent.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanelMarkEvent.h rename to MONITOR/MONITORzmq/AliStorageAdministratorPanelMarkEvent.h diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanelSetStorageParams.cxx b/MONITOR/MONITORzmq/AliStorageAdministratorPanelSetStorageParams.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanelSetStorageParams.cxx rename to MONITOR/MONITORzmq/AliStorageAdministratorPanelSetStorageParams.cxx diff --git a/MONITOR/alistoragemanager/AliStorageAdministratorPanelSetStorageParams.h b/MONITOR/MONITORzmq/AliStorageAdministratorPanelSetStorageParams.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageAdministratorPanelSetStorageParams.h rename to MONITOR/MONITORzmq/AliStorageAdministratorPanelSetStorageParams.h diff --git a/MONITOR/alistoragemanager/AliStorageClientThread.cxx b/MONITOR/MONITORzmq/AliStorageClientThread.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageClientThread.cxx rename to MONITOR/MONITORzmq/AliStorageClientThread.cxx diff --git a/MONITOR/alistoragemanager/AliStorageClientThread.h b/MONITOR/MONITORzmq/AliStorageClientThread.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageClientThread.h rename to MONITOR/MONITORzmq/AliStorageClientThread.h diff --git a/MONITOR/alistoragemanager/AliStorageDatabase.cxx b/MONITOR/MONITORzmq/AliStorageDatabase.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageDatabase.cxx rename to MONITOR/MONITORzmq/AliStorageDatabase.cxx diff --git a/MONITOR/alistoragemanager/AliStorageDatabase.h b/MONITOR/MONITORzmq/AliStorageDatabase.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageDatabase.h rename to MONITOR/MONITORzmq/AliStorageDatabase.h diff --git a/MONITOR/alistoragemanager/AliStorageEventManager.cxx b/MONITOR/MONITORzmq/AliStorageEventManager.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageEventManager.cxx rename to MONITOR/MONITORzmq/AliStorageEventManager.cxx diff --git a/MONITOR/alistoragemanager/AliStorageEventManager.h b/MONITOR/MONITORzmq/AliStorageEventManager.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageEventManager.h rename to MONITOR/MONITORzmq/AliStorageEventManager.h diff --git a/MONITOR/alistoragemanager/AliStorageServerThread.cxx b/MONITOR/MONITORzmq/AliStorageServerThread.cxx similarity index 100% rename from MONITOR/alistoragemanager/AliStorageServerThread.cxx rename to MONITOR/MONITORzmq/AliStorageServerThread.cxx diff --git a/MONITOR/alistoragemanager/AliStorageServerThread.h b/MONITOR/MONITORzmq/AliStorageServerThread.h similarity index 100% rename from MONITOR/alistoragemanager/AliStorageServerThread.h rename to MONITOR/MONITORzmq/AliStorageServerThread.h diff --git a/MONITOR/MONITORzmq/CMakeLists.txt b/MONITOR/MONITORzmq/CMakeLists.txt new file mode 100644 index 00000000000..48f77767313 --- /dev/null +++ b/MONITOR/MONITORzmq/CMakeLists.txt @@ -0,0 +1,91 @@ +# ************************************************************************** +# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. * +# * * +# * Author: The ALICE Off-line Project. * +# * Contributors are mentioned in the code where appropriate. * +# * * +# * Permission to use, copy, modify and distribute this software and its * +# * documentation strictly for non-commercial purposes is hereby granted * +# * without fee, provided that the above copyright notice appears in all * +# * copies and that both the copyright notice and this permission notice * +# * appear in the supporting documentation. The authors make no claims * +# * about the suitability of this software for any purpose. It is * +# * provided "as is" without express or implied warranty. * +# ************************************************************************** + +# Module +set(MODULE MONITORzmq) + +# Module include folder +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/${MODULE} + ${AliRoot_SOURCE_DIR}/MONITOR/alistoragemanager + ${AliRoot_SOURCE_DIR}/MONITOR/alionlinereco + ) + +# Additional include folders in alphabetical order +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/MONITOR + ${AliRoot_SOURCE_DIR}/STEER/CDB + ${AliRoot_SOURCE_DIR}/STEER/ESD + ${AliRoot_SOURCE_DIR}/STEER/STEER + ${AliRoot_SOURCE_DIR}/STEER/STEERBase + ) + +# Sources in alphabetical order +set(SRCS + AliCommunicationThread.cxx + AliDIMListenerThread.cxx + AliEventsCollectorThread.cxx + AliOnlineReconstruction.cxx + AliStorageAdministratorPanel.cxx + AliStorageAdministratorPanelListEvents.cxx + AliStorageAdministratorPanelMarkEvent.cxx + AliStorageAdministratorPanelSetStorageParams.cxx + AliStorageClientThread.cxx + AliStorageDatabase.cxx + AliStorageEventManager.cxx + AliStorageServerThread.cxx + ) + +if(DIMDIR AND ODIR) + set(SRCS ${SRCS} + ${AliRoot_SOURCE_DIR}/MONITOR/MONITOR/SORNotifier.cxx + ) + include_directories(${DIMDIR}/dim) + link_directories(${DIMDIR}/${ODIR}) + add_definitions(-DALI_DIM) +endif() + +# Headers from sources +string(REPLACE ".cxx" ".h" HDRS "${SRCS}") + +# Generate the dictionary +# It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument +get_directory_property(incdirs INCLUDE_DIRECTORIES) +generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") + +# Generate the ROOT map +# Dependecies +set(LIBDEPS STEERBase STEER ESD CDB MONITOR) +generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") + +# Add a library to the project using the specified source files +add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) +target_link_libraries(${MODULE} STEERBase STEER ESD CDB MONITOR) +if(DIMDIR AND ODIR) + target_link_libraries(${MODULE} dim) +endif() + +# Additional compilation flags +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") + +# System dependent: Modify the way the library is build +if(${CMAKE_SYSTEM} MATCHES Darwin) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") +endif(${CMAKE_SYSTEM} MATCHES Darwin) + +# Installation +install(TARGETS ${MODULE} + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(FILES ${HDRS} DESTINATION include) \ No newline at end of file diff --git a/MONITOR/MONITORzmqLinkDef.h b/MONITOR/MONITORzmq/MONITORzmqLinkDef.h similarity index 100% rename from MONITOR/MONITORzmqLinkDef.h rename to MONITOR/MONITORzmq/MONITORzmqLinkDef.h diff --git a/MONITOR/alitestproc/CMakeLists.txt b/MONITOR/alitestproc/CMakeLists.txt new file mode 100644 index 00000000000..37f5ee3e37e --- /dev/null +++ b/MONITOR/alitestproc/CMakeLists.txt @@ -0,0 +1,52 @@ +# ************************************************************************** +# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. * +# * * +# * Author: The ALICE Off-line Project. * +# * Contributors are mentioned in the code where appropriate. * +# * * +# * Permission to use, copy, modify and distribute this software and its * +# * documentation strictly for non-commercial purposes is hereby granted * +# * without fee, provided that the above copyright notice appears in all * +# * copies and that both the copyright notice and this permission notice * +# * appear in the supporting documentation. The authors make no claims * +# * about the suitability of this software for any purpose. It is * +# * provided "as is" without express or implied warranty. * +# ************************************************************************** + +set(MODULE alitestproc) + +# Module include folder +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/alitestproc + ) + +# Additional include folders in alphabetical order +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/MONITOR + ) + +# Sources in alphabetical order +set(SRCS + alitestproc.cxx + ) + +# Headers from sources +string(REPLACE ".cxx" ".h" HDRS "${SRCS}") + +if(DIMDIR AND ODIR) + link_directories(${DIMDIR}/${ODIR}) +endif() + +# Add an executable to the project using the specified source files +add_executable(${MODULE} ${SRCS}) +target_link_libraries(${MODULE} MONITOR Rint) + +if(DATE_FOUND) + target_link_libraries(${MODULE} ${DATE_MONLIBS}) +endif() + +if(ZEROMQ_FOUND) + target_link_libraries(${MODULE} MONITORzmq) + add_definitions(-DZMQ) +ENDIF(ZEROMQ_FOUND) + +# Installation +install(TARGETS ${MODULE} RUNTIME DESTINATION bin) \ No newline at end of file diff --git a/MONITOR/deroot/CMakeLists.txt b/MONITOR/deroot/CMakeLists.txt new file mode 100644 index 00000000000..2918116be9d --- /dev/null +++ b/MONITOR/deroot/CMakeLists.txt @@ -0,0 +1,51 @@ +# ************************************************************************** +# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. * +# * * +# * Author: The ALICE Off-line Project. * +# * Contributors are mentioned in the code where appropriate. * +# * * +# * Permission to use, copy, modify and distribute this software and its * +# * documentation strictly for non-commercial purposes is hereby granted * +# * without fee, provided that the above copyright notice appears in all * +# * copies and that both the copyright notice and this permission notice * +# * appear in the supporting documentation. The authors make no claims * +# * about the suitability of this software for any purpose. It is * +# * provided "as is" without express or implied warranty. * +# ************************************************************************** + +set(MODULE deroot) + +# Module include folder +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/${MODULE} + ) + +# Additional include folders in alphabetical order +include_directories(${AliRoot_SOURCE_DIR}/RAW/RAWDatabase + ${AliRoot_SOURCE_DIR}/STEER/STEERBase + ) + +# Sources in alphabetical order +set(SRCS + deroot.cxx + root2date.cxx + ) + +# Headers from sources +string(REPLACE ".cxx" ".h" HDRS "${SRCS}") + +if(DIMDIR AND ODIR) + link_directories(${DIMDIR}/${ODIR}) +endif() + +# Add an executable to the project using the specified source files +add_executable(${MODULE} ${SRCS}) +target_link_libraries(${MODULE} STEERBase RAWDatabase) + + +if(ZEROMQ_FOUND) + target_link_libraries(${MODULE} MONITORzmq) + add_definitions(-DZMQ) +ENDIF(ZEROMQ_FOUND) + +# Installation +install(TARGETS ${MODULE} RUNTIME DESTINATION bin) \ No newline at end of file diff --git a/MONITOR/monitorCheck/CMakeLists.txt b/MONITOR/monitorCheck/CMakeLists.txt new file mode 100644 index 00000000000..11bc2ce0beb --- /dev/null +++ b/MONITOR/monitorCheck/CMakeLists.txt @@ -0,0 +1,52 @@ +# ************************************************************************** +# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. * +# * * +# * Author: The ALICE Off-line Project. * +# * Contributors are mentioned in the code where appropriate. * +# * * +# * Permission to use, copy, modify and distribute this software and its * +# * documentation strictly for non-commercial purposes is hereby granted * +# * without fee, provided that the above copyright notice appears in all * +# * copies and that both the copyright notice and this permission notice * +# * appear in the supporting documentation. The authors make no claims * +# * about the suitability of this software for any purpose. It is * +# * provided "as is" without express or implied warranty. * +# ************************************************************************** + +set(MODULE monitorCheck) + +# Module include folder +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/${MODULE} + ) + +# Additional include folders in alphabetical order +include_directories(${AliRoot_SOURCE_DIR} + ) + +# Sources in alphabetical order +set(SRCS + monitorCheck.cxx + ) + +# Headers from sources +string(REPLACE ".cxx" ".h" HDRS "${SRCS}") + +if(DIMDIR AND ODIR) + link_directories(${DIMDIR}/${ODIR}) +endif() + +# Add an executable to the project using the specified source files +add_executable(${MODULE} ${SRCS}) +target_link_libraries(${MODULE} Core) + +if(DATE_FOUND) + target_link_libraries(${MODULE} ${DATE_MONLIBS}) +endif() + +if(ZEROMQ_FOUND) + target_link_libraries(${MODULE} MONITORzmq) + add_definitions(-DZMQ) +ENDIF(ZEROMQ_FOUND) + +# Installation +install(TARGETS ${MODULE} RUNTIME DESTINATION bin) \ No newline at end of file diff --git a/MONITOR/monitorGDC/CMakeLists.txt b/MONITOR/monitorGDC/CMakeLists.txt new file mode 100644 index 00000000000..96ba2d28000 --- /dev/null +++ b/MONITOR/monitorGDC/CMakeLists.txt @@ -0,0 +1,52 @@ +# ************************************************************************** +# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. * +# * * +# * Author: The ALICE Off-line Project. * +# * Contributors are mentioned in the code where appropriate. * +# * * +# * Permission to use, copy, modify and distribute this software and its * +# * documentation strictly for non-commercial purposes is hereby granted * +# * without fee, provided that the above copyright notice appears in all * +# * copies and that both the copyright notice and this permission notice * +# * appear in the supporting documentation. The authors make no claims * +# * about the suitability of this software for any purpose. It is * +# * provided "as is" without express or implied warranty. * +# ************************************************************************** + +set(MODULE monitorGDC) + +# Module include folder +include_directories(${AliRoot_SOURCE_DIR}/MONITOR/${MODULE} + ) + +# Additional include folders in alphabetical order +include_directories(${AliRoot_SOURCE_DIR} + ) + +# Sources in alphabetical order +set(SRCS + monitorGDC.cxx + ) + +# Headers from sources +string(REPLACE ".cxx" ".h" HDRS "${SRCS}") + +if(DIMDIR AND ODIR) + link_directories(${DIMDIR}/${ODIR}) +endif() + +# Add an executable to the project using the specified source files +add_executable(${MODULE} ${SRCS}) +target_link_libraries(${MODULE} Core) + +if(DATE_FOUND) + target_link_libraries(${MODULE} ${DATE_MONLIBS}) +endif() + +if(ZEROMQ_FOUND) + target_link_libraries(${MODULE} MONITORzmq) + add_definitions(-DZMQ) +ENDIF(ZEROMQ_FOUND) + +# Installation +install(TARGETS ${MODULE} RUNTIME DESTINATION bin) \ No newline at end of file diff --git a/STEER/STEER/CMakeLists.txt b/STEER/STEER/CMakeLists.txt index 7b95f340890..7c74d860530 100644 --- a/STEER/STEER/CMakeLists.txt +++ b/STEER/STEER/CMakeLists.txt @@ -23,7 +23,6 @@ include_directories(${AliRoot_SOURCE_DIR}/STEER/${MODULE}) include_directories(${ROOT_INCLUDE_DIRS} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/HLT/BASE - ${AliRoot_SOURCE_DIR}/RAW/ ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB @@ -165,7 +164,7 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") # Generate the ROOT map # Dependecies -set(LIBDEPS ANALYSIS RAWDatabase RAWDatarec CDB ESD Core EG GenVector GeomPainter Geom Gpad Graf Hist MathCore Matrix Minuit Net Physics Proof RIO Tree VMC) +set(LIBDEPS STEERBase ANALYSIS RAWDatabase RAWDatarec CDB ESD Core EG GenVector GeomPainter Geom Gpad Graf Hist MathCore Matrix Minuit Net Physics Proof RIO Tree VMC) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") set(LIBHLTSIM_VERSION "1") @@ -176,7 +175,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") -target_link_libraries(${MODULE} ANALYSIS RAWDatabase RAWDatarec CDB ESD HLTbase Core EG GenVector GeomPainter Geom Gpad Graf Hist MathCore Matrix Minuit Net Physics Proof RIO Tree VMC) +target_link_libraries(${MODULE} STEERBase RAWDatabase RAWDatarec CDB ESD ANALYSIS HLTbase Core EG GenVector GeomPainter Geom Gpad Graf Hist MathCore Matrix Minuit Net Physics Proof RIO Tree VMC) # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/TPCcalib/CMakeLists.txt b/TPC/TPCcalib/CMakeLists.txt index 0d6c02ed55f..208b6dd068f 100644 --- a/TPC/TPCcalib/CMakeLists.txt +++ b/TPC/TPCcalib/CMakeLists.txt @@ -22,6 +22,7 @@ include_directories(${AliRoot_SOURCE_DIR}/TPC/${MODULE}) # Additional include folders in alphabetical order except ROOT include_directories(${ROOT_INCLUDE_DIRS} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS + ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/RAW/dateStream ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec @@ -71,10 +72,9 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") # Generate the ROOT map # Dependecies -set(LIBDEPS STEERBase CDB ESD STEER ANALYSIS STAT RAWDatarec RAWDatabase TPCbase TPCrec Minuit) +set(LIBDEPS STEERBase CDB ESD STEER ANALYSIS ANALYSISalice STAT RAWDatarec RAWDatabase TPCbase TPCrec Minuit) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") - # Add a library to the project using the specified source files add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) -- 2.39.3