HLT CALO, EMCAL, EVE, Comp

diff --git a/HLT/CALO/CMakeLists.txt b/HLT/CALO/CMakeLists.txt
index 1c3df4fb8290e2327f7c4698ede0ee2db431176d..9f5df48cc4fbc73e6c992455e70404bf9d7e5632 100644 (file)
--- a/HLT/CALO/CMakeLists.txt
+++ b/HLT/CALO/CMakeLists.txt
@@ -82,7 +82,6 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
-add_definitions(-Duse_aliroot -Duse_root -DROWHOUGHPARAMS)
 
 # Additional compilation flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")

diff --git a/HLT/CMakeLists.txt b/HLT/CMakeLists.txt
index 335db15640d7dc1b7a2476411492b75a934875a8..6ea6bbd02f995059fcef5eb4c8f132aaa9cbc43f 100644 (file)
--- a/HLT/CMakeLists.txt
+++ b/HLT/CMakeLists.txt
@@ -16,6 +16,8 @@
 option(HLT_CUDA   "Build HLT GPU tracker using CUDA"   OFF)
 option(HLT_OPENCL "Build HLT GPU tracker using OpenCL" OFF)
 
+add_definitions(-Duse_aliroot -Duse_root -DROWHOUGHPARAMS)
+
 # AliRoot debug mode
 if(ALIDEBUG)
     add_definitions(-DDEBUG -D__DEBUG)
@@ -32,6 +34,11 @@ endif (ALIHLT_MLUCDIR)
 
 add_subdirectory(CALO)
 add_subdirectory(comp)
+add_subdirectory(EMCAL)
+# Enable EVE if ROOT has OpenGL support
+if(ROOT_HASOPENGL STREQUAL "yes")
+    add_subdirectory(EVE)
+endif()
 
 #file(GLOB PACKAGES CMake*.pkg)
 

diff --git a/HLT/EMCAL/AliHLTEMCALLinkDef.h b/HLT/EMCAL/AliHLTEMCALLinkDef.h
new file mode 100644 (file)
index 0000000..ea849ea
--- /dev/null
+++ b/HLT/EMCAL/AliHLTEMCALLinkDef.h
@@ -0,0 +1,27 @@
+#if !defined(__CINT__) && !defined(__CLING__)
+# error Not for compilation
+#else 
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AliHLTEMCALDefinitions+;
+#pragma link C++ class AliHLTEMCALRawAnalyzerComponent+;
+#pragma link C++ class AliHLTEMCALMapper+;
+#pragma link C++ class AliHLTEMCALRawAnalyzerCrudeComponent+;
+#pragma link C++ class AliHLTEMCALRawAnalyzerLMSComponent+;
+#pragma link C++ class AliHLTEMCALRawAnalyzerPeakFinderComponent+;
+#pragma link C++ class AliHLTEMCALRawAnalyzerFastFitComponent+;
+#pragma link C++ class AliHLTEMCALRawAnalyzerNNComponent+;
+#pragma link C++ class AliHLTEMCALConstants+;
+#pragma link C++ class AliHLTEMCALDigitMakerComponent+;
+#pragma link C++ class AliHLTEMCALClusterizerComponent+;
+#pragma link C++ class AliHLTEMCALGeometry+;
+#pragma link C++ class AliHLTEMCALRecoParamHandler+;
+#pragma link C++ class AliHLTEMCALClusterizerComponentNbyN+;
+#pragma link C++ class AliHLTEMCALClusterMonitorComponent+;
+#pragma link C++ class AliHLTEMCALClusterMonitor+;
+#pragma link C++ class AliHLTEMCALAgent+;
+#pragma link C++ class AliHLTEMCALDigitHandler+;
+
+#endif // __CINT__

diff --git a/HLT/EMCAL/CMakeLists.txt b/HLT/EMCAL/CMakeLists.txt
new file mode 100644 (file)
index 0000000..266bd01
--- /dev/null
+++ b/HLT/EMCAL/CMakeLists.txt
@@ -0,0 +1,87 @@
+# **************************************************************************
+# * 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 AliHLTEMCAL)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/HLT/EMCAL
+                   )
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/EMCAL/EMCALbase
+                    ${CMAKE_SOURCE_DIR}/EMCAL/EMCALraw
+                    ${CMAKE_SOURCE_DIR}/EMCAL/EMCALUtils
+                    ${CMAKE_SOURCE_DIR}/HLT/CALO
+                    ${CMAKE_SOURCE_DIR}/HLT/BASE
+                    ${CMAKE_SOURCE_DIR}/HLT/BASE/util
+                    ${CMAKE_SOURCE_DIR}/STEER/CDB
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliHLTEMCALAgent.cxx
+    AliHLTEMCALClusterizerComponent.cxx
+    AliHLTEMCALClusterizerComponentNbyN.cxx
+    AliHLTEMCALClusterMonitorComponent.cxx
+    AliHLTEMCALClusterMonitor.cxx
+    AliHLTEMCALConstants.cxx
+    AliHLTEMCALDefinitions.cxx
+    AliHLTEMCALDigitMakerComponent.cxx
+    AliHLTEMCALGeometry.cxx
+    AliHLTEMCALMapper.cxx
+    AliHLTEMCALRawAnalyzerComponent.cxx
+    AliHLTEMCALRawAnalyzerCrudeComponent.cxx
+    AliHLTEMCALRawAnalyzerFastFitComponent.cxx
+    AliHLTEMCALRawAnalyzerLMSComponent.cxx
+    AliHLTEMCALRawAnalyzerNNComponent.cxx
+    AliHLTEMCALRawAnalyzerPeakFinderComponent.cxx
+    AliHLTEMCALRecoParamHandler.cxx
+    offline/AliHLTEMCALDigitHandler.cxx
+   )
+
+# 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 CDB HLTbase AliHLTCalo EMCALbase EMCALUtils EMCALraw)
+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)
+
+# 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/HLT/EVE/AliHLTEveHLT.cxx b/HLT/EVE/AliHLTEveHLT.cxx
index 27cca045b8e8569d74ce543115125736be0b1330..73f4aa6df549f5491efee95e99ecece9ad84aae9 100644 (file)
--- a/HLT/EVE/AliHLTEveHLT.cxx
+++ b/HLT/EVE/AliHLTEveHLT.cxx
@@ -35,8 +35,8 @@
 #include "AliEveTrack.h"
 #include "TEveVSDStructs.h"
 #include "TString.h"
-#include "TPCLib/tracking-ca/AliHLTTPCCATrackParam.h"
-#include "TPCLib/tracking-ca/AliHLTTPCCATrackConvertor.h"
+#include "tracking-ca/AliHLTTPCCATrackParam.h"
+#include "tracking-ca/AliHLTTPCCATrackConvertor.h"
 #include "AliEveMagField.h"
 #include "TH1.h"
 #include "TH1F.h"

diff --git a/HLT/EVE/AliHLTEveITS.cxx b/HLT/EVE/AliHLTEveITS.cxx
index b82782f0f1bfe189fe9dd95f13152d3de74ff1c0..94057c94f50fc9707936ba0b3c69e5b8af3b2394 100644 (file)
--- a/HLT/EVE/AliHLTEveITS.cxx
+++ b/HLT/EVE/AliHLTEveITS.cxx
@@ -26,7 +26,7 @@
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TEvePointSet.h"
-#include "ITS/AliHLTITSClusterDataFormat.h"
+#include "AliHLTITSClusterDataFormat.h"
 #include "AliITSRecPoint.h"
 #include "TCanvas.h"
 

diff --git a/HLT/EVE/AliHLTEveLinkDef.h b/HLT/EVE/AliHLTEveLinkDef.h
new file mode 100644 (file)
index 0000000..5c3bccc
--- /dev/null
+++ b/HLT/EVE/AliHLTEveLinkDef.h
@@ -0,0 +1,24 @@
+#if !defined(__CINT__) && !defined(__CLING__)
+# error Not for compilation
+#else 
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AliHLTEveBase+;
+#pragma link C++ class AliHLTEveCalo+;
+#pragma link C++ class AliHLTEvePhos+;
+#pragma link C++ class AliHLTEveEmcal+;
+#pragma link C++ class AliHLTEveTPC+;
+#pragma link C++ class AliHLTEveHLT+;
+#pragma link C++ class AliHLTEveITS+;
+#pragma link C++ class AliHLTEveISSD+;
+#pragma link C++ class AliHLTEveISPD+;
+#pragma link C++ class AliHLTEveISDD+;
+#pragma link C++ class AliHLTEveTRD+;
+#pragma link C++ class AliHLTEveMuon+;
+#pragma link C++ class AliHLTEveAny+;
+#pragma link C++ class AliHLTEveMultCorr+;
+#pragma link C++ class AliHLTEveHistoMerger+;
+
+#endif // __CINT__

diff --git a/HLT/EVE/CMakeLists.txt b/HLT/EVE/CMakeLists.txt
new file mode 100644 (file)
index 0000000..82f9f41
--- /dev/null
+++ b/HLT/EVE/CMakeLists.txt
@@ -0,0 +1,96 @@
+# **************************************************************************
+# * 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 AliHLTEve)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/HLT/EVE)
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/EMCAL/EMCALUtils
+                    ${CMAKE_SOURCE_DIR}/EVE/EveBase
+                    ${CMAKE_SOURCE_DIR}/EVE/EveDet
+                    ${CMAKE_SOURCE_DIR}/EVE/EveHLT
+                    ${CMAKE_SOURCE_DIR}/HLT/BASE
+                    ${CMAKE_SOURCE_DIR}/HLT/BASE/util
+                    ${CMAKE_SOURCE_DIR}/HLT/ITS
+                    ${CMAKE_SOURCE_DIR}/HLT/MUON
+                    ${CMAKE_SOURCE_DIR}/HLT/TPCLib
+                    ${CMAKE_SOURCE_DIR}/HLT/TRD
+                    ${CMAKE_SOURCE_DIR}/ITS/ITSbase
+                    ${CMAKE_SOURCE_DIR}/MUON/MUONbase
+                    ${CMAKE_SOURCE_DIR}/MUON/MUONcore
+                    ${CMAKE_SOURCE_DIR}/MUON/MUONraw
+                    ${CMAKE_SOURCE_DIR}/MUON/MUONrec
+                    ${CMAKE_SOURCE_DIR}/PHOS/PHOSbase
+                    ${CMAKE_SOURCE_DIR}/PHOS/PHOSUtils
+                    ${CMAKE_SOURCE_DIR}/STEER/CDB
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                    ${CMAKE_SOURCE_DIR}/TRD/TRDrec
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliHLTEveAny.cxx
+    AliHLTEveBase.cxx
+    AliHLTEveCalo.cxx
+    AliHLTEveEmcal.cxx
+    AliHLTEveHistoMerger.cxx
+    AliHLTEveHLT.cxx
+    AliHLTEveISDD.cxx
+    AliHLTEveISPD.cxx
+    AliHLTEveISSD.cxx
+    AliHLTEveITS.cxx
+    AliHLTEveMultCorr.cxx
+    AliHLTEveMuon.cxx
+    AliHLTEvePhos.cxx
+    AliHLTEveTPC.cxx
+    AliHLTEveTRD.cxx
+   )
+
+# 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 CDB ESD STEERBase HLTbase EveHLT PHOSbase PHOSUtils EMCALUtils EveBase EveDet AliHLTTPC AliHLTMUON AliHLTITS AliHLTTRD ITSbase MUONcore MUONbase MUONraw MUONrec)
+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)
+
+# 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/HLT/comp/CMakeLists.txt b/HLT/comp/CMakeLists.txt
index 52a04aa535cc977568b4a641b6745df0e6e47db8..0fff40ed99ea49dbff442dcd011a8c14c86f888e 100644 (file)
--- a/HLT/comp/CMakeLists.txt
+++ b/HLT/comp/CMakeLists.txt
@@ -44,7 +44,6 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
-add_definitions(-Duse_aliroot -Duse_root -DROWHOUGHPARAMS)
 
 # Additional compilation flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")

diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake
index 1be750d9c469fd4ad7d01363ffc674cb35c4b5ac..0d057003044c9721d584bd0a51e1e51150b857bf 100644 (file)
--- a/cmake/FindROOT.cmake
+++ b/cmake/FindROOT.cmake
@@ -29,6 +29,7 @@
 # - ROOT_GLIBRARIES - regular + GUI ROOT libraries + path to be used during linking
 # - ROOT_INCLUDE_DIRS - full path to ROOT include folder
 # - ROOT_HASALIEN - ROOT was built with AliEn support
+# - ROOT_HASOPENGL - ROOT was built with OpenGL support
 # - ROOT_HASXML - ROOT was built with XML support
 # - ROOT_FORTRAN - fortran compiler
 
@@ -146,8 +147,14 @@ if(ROOTSYS)
     endif(error)
     string(STRIP ${ROOT_HASXML} ROOT_HASXML)
 
+    # Checking for OpenGL support
+    execute_process(COMMAND ${ROOT_CONFIG} --has-opengl OUTPUT_VARIABLE ROOT_HASOPENGL ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
+    if(error)
+        message(FATAL_ERROR "Error checking if ROOT was build with OpenGL support: ${error}")
+    endif(error)
+    string(STRIP ${ROOT_HASOPENGL} ROOT_HASOPENGL)
 
-    # Checking for xml support
+    # Checking for fortran compiler
     execute_process(COMMAND ${ROOT_CONFIG} --f77 OUTPUT_VARIABLE ROOT_FORTRAN ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
     if(error)
         message(FATAL_ERROR "Error checking ROOT fortran compiler: ${error}")