MONITOR with ZMQ

diff --git a/MONITOR/CMakeLists.txt b/MONITOR/CMakeLists.txt
index 04e6414a5e2257b23d8c52d953c8c5b9426f472f..35453cd98b215638e7731e2c51c8b71fce19dfd9 100644 (file)
--- a/MONITOR/CMakeLists.txt
+++ b/MONITOR/CMakeLists.txt
@@ -24,12 +24,8 @@ add_subdirectory(monitorGDC)
 
 if(ZEROMQ_FOUND)
     add_subdirectory(MONITORzmq)
-#  alistoragemanager/CMakebinalistorage.pkg
-#  alistoragemanager/CMakebinalistorageadmin.pkg
-#  alistoragemanager/CMakebinalifakedisplay.pkg
-#  alistoragemanager/CMakebinalistorageminimalexample.pkg
-#  alistoragemanager/CMakebinalistoragegetpoints.pkg
-#  alieventserver/CMakebinalieventserver.pkg
+    add_subdirectory(alistoragemanager)
+    add_subdirectory(alionlinereco)
 endif(ZEROMQ_FOUND)
 
 

diff --git a/MONITOR/MONITORzmq/CMakeLists.txt b/MONITOR/MONITORzmq/CMakeLists.txt
index 48f77767313cf54108f93149b064a9984c3c0584..969d4e07c2a040b8d3679575e3a6fd0f71d9ac94 100644 (file)
--- a/MONITOR/MONITORzmq/CMakeLists.txt
+++ b/MONITOR/MONITORzmq/CMakeLists.txt
@@ -65,12 +65,12 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
 # Generate the ROOT map
 # Dependecies
-set(LIBDEPS STEERBase STEER ESD CDB MONITOR)
+set(LIBDEPS STEERBase STEER ESD CDB MONITOR zmq)
 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)
+target_link_libraries(${MODULE} STEERBase STEER ESD CDB MONITOR zmq)
 if(DIMDIR AND ODIR)
     target_link_libraries(${MODULE} dim)
 endif()

diff --git a/MONITOR/alionlinereco/CMakeLists.txt b/MONITOR/alionlinereco/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7170920
--- /dev/null
+++ b/MONITOR/alionlinereco/CMakeLists.txt
@@ -0,0 +1,48 @@
+# **************************************************************************
+# * 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 include folder
+include_directories(${AliRoot_SOURCE_DIR}/MONITOR/alionlinereco
+                   )
+
+# Additional include folders in alphabetical order
+include_directories(${AliRoot_SOURCE_DIR}/MONITOR/MONITOR
+                    ${AliRoot_SOURCE_DIR}/MONITOR/MONITORzmq
+                    ${AliRoot_SOURCE_DIR}/STEER/CDB
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+add_definitions(-DZMQ)
+
+if(DIMDIR AND ODIR)
+    link_directories(${DIMDIR}/${ODIR})
+endif()
+
+if(DATE_FOUND)
+    message(STATUS  "Do something here")
+endif()
+
+# alistorage executable
+add_executable(alionlinereco onlinereco.cxx)
+target_link_libraries(alionlinereco MONITOR MONITORzmq STEERBase STEER)
+if(PYTHIA6)
+    target_link_libraries(alionlinereco EVGEN HepMC HepMCParser)
+endif(PYTHIA6)
+
+# Installation
+install(TARGETS alionlinereco RUNTIME DESTINATION bin)
+
+

diff --git a/MONITOR/alistoragemanager/CMakeLists.txt b/MONITOR/alistoragemanager/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7d4b35a
--- /dev/null
+++ b/MONITOR/alistoragemanager/CMakeLists.txt
@@ -0,0 +1,85 @@
+# **************************************************************************
+# * 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 include folder
+include_directories(${AliRoot_SOURCE_DIR}/MONITOR/alistoragemanager
+                   )
+
+# Additional include folders in alphabetical order
+include_directories(${AliRoot_SOURCE_DIR}/MONITOR/MONITOR
+                    ${AliRoot_SOURCE_DIR}/MONITOR/MONITORzmq
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+add_definitions(-DZMQ)
+
+if(DIMDIR AND ODIR)
+    link_directories(${DIMDIR}/${ODIR})
+endif()
+
+# alistorage executable
+add_executable(alistorage alistorage.cxx)
+target_link_libraries(alistorage MONITOR MONITORzmq)
+if(PYTHIA6)
+    target_link_libraries(alistorage EVGEN HepMC HepMCParser)
+endif(PYTHIA6)
+
+# Installation
+install(TARGETS alistorage RUNTIME DESTINATION bin)
+
+
+# alistorageadmin executable
+add_executable(alistorageadmin alistorageadmin.cxx)
+target_link_libraries(alistorageadmin MONITOR MONITORzmq)
+if(PYTHIA6)
+    target_link_libraries(alistorageadmin EVGEN HepMC HepMCParser)
+endif(PYTHIA6)
+
+# Installation
+install(TARGETS alistorageadmin RUNTIME DESTINATION bin)
+
+
+# alifakedisplay executable
+add_executable(alifakedisplay alifakedisplay.cxx)
+target_link_libraries(alifakedisplay MONITOR MONITORzmq)
+if(PYTHIA6)
+    target_link_libraries(alifakedisplay EVGEN HepMC HepMCParser)
+endif(PYTHIA6)
+
+# Installation
+install(TARGETS alifakedisplay RUNTIME DESTINATION bin)
+
+
+# alistorageminimalexample executable
+add_executable(alistorageminimalexample alistorageminimalexample.cxx)
+target_link_libraries(alistorageminimalexample MONITOR MONITORzmq)
+if(PYTHIA6)
+    target_link_libraries(alistorageminimalexample EVGEN HepMC HepMCParser)
+endif(PYTHIA6)
+
+# Installation
+install(TARGETS alistorageminimalexample RUNTIME DESTINATION bin)
+
+
+# alistoragegetpoints executable
+add_executable(alistoragegetpoints alistoragegetpoints.cxx)
+target_link_libraries(alistoragegetpoints MONITOR MONITORzmq XMLIO)
+if(PYTHIA6)
+    target_link_libraries(alistoragegetpoints EVGEN HepMC HepMCParser)
+endif(PYTHIA6)
+
+# Installation
+install(TARGETS alistoragegetpoints RUNTIME DESTINATION bin)

diff --git a/RAW/RAWDatabase/CMakeLists.txt b/RAW/RAWDatabase/CMakeLists.txt
index a17fb51a56abd72ab7acb6c9a5a61c5f1f710895..ec197df70be27c735d232713c2a48174b2abbeba 100644 (file)
--- a/RAW/RAWDatabase/CMakeLists.txt
+++ b/RAW/RAWDatabase/CMakeLists.txt
@@ -48,7 +48,9 @@ set(SRCS
 string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
 
 # Extra headers in alphabetical order
-set(HDRS ${HDRS} AliRawEventHeaderVersions.h AliRawDataHeader.h AliRawDataHeaderV3.h)
+set(HDRS ${HDRS} AliRawEventHeaderVersions.h)
+
+#There is some DATE here, check out the lib version
 
 # Generate the dictionary
 # It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument

diff --git a/RAW/RAWDatabase/RAWDatabaseLinkDef.h b/RAW/RAWDatabase/RAWDatabaseLinkDef.h
index b6f9dbb54194fc9491e3ecf0140251704c97e496..3d6ec7710691f5c1bde30891c2d2a473cfd69500 100644 (file)
--- a/RAW/RAWDatabase/RAWDatabaseLinkDef.h
+++ b/RAW/RAWDatabase/RAWDatabaseLinkDef.h
@@ -8,7 +8,7 @@
 #pragma link C++ class AliRawEvent-;
 #pragma link C++ class AliRawEventV2+;
 #pragma link C++ class AliRawEventHeaderBase+;
-#pragma link C++ defined_in RAW/AliRawEventHeaderVersions.h;
+#pragma link C++ defined_in AliRawEventHeaderVersions.h;
 #pragma link C++ class AliRawEquipmentHeader;
 #pragma link C++ class AliRawVEquipment+;
 #pragma link C++ class AliRawEquipment-;