ANALYSIS module

diff --git a/ANALYSIS/ANALYSIS/CMakeLists.txt b/ANALYSIS/ANALYSIS/CMakeLists.txt
index 2e937912d95ba9197550871e5a968cff6ad8201c..3837eb4174be50344306399bb14b58d1e9112ef4 100644 (file)
--- a/ANALYSIS/ANALYSIS/CMakeLists.txt
+++ b/ANALYSIS/ANALYSIS/CMakeLists.txt
@@ -58,7 +58,7 @@ endif(${CMAKE_SYSTEM} MATCHES Darwin)
 
 # Installation
 install(TARGETS ${MODULE}
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib)
-install(FILES ${HDRS} DESTINATION include)
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib)
 
+install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file

diff --git a/ANALYSIS/ANALYSISalice/CMakeLists.txt b/ANALYSIS/ANALYSISalice/CMakeLists.txt
index 47cbee22628d63d0b15661fbb325336913dfa8d0..477ae6238cc0562bbdb60ae799bf686a67cda197 100644 (file)
--- a/ANALYSIS/ANALYSISalice/CMakeLists.txt
+++ b/ANALYSIS/ANALYSISalice/CMakeLists.txt
@@ -30,7 +30,6 @@ include_directories(${ROOT_INCLUDE_DIRS}
 
 # Sources in alphabetical order 
 set(SRCS 
-    AliAnalysisAlien.cxx
     AliAnalysisCuts.cxx
     AliAnalysisFilter.cxx
     AliAnalysisTaskBadChunkID.cxx
@@ -73,6 +72,13 @@ set(SRCS
     AliXMLCollection.cxx
   )
 
+# If ROOT was build with no AliEn support we disable the AliROOT AliEn support
+if(ROOT_HASALIEN STREQUAL "no")
+    message(STATUS "ROOT was build with no alien support. Disabling AliROOT AliEn support")
+else()
+    set(SRCS ${SRCS} AliAnalysisAlien.cxx)
+endif(ROOT_HASALIEN STREQUAL "no")
+
 # Headers from sources
 string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
 

diff --git a/ANALYSIS/ANALYSIScalib/CMakeLists.txt b/ANALYSIS/ANALYSIScalib/CMakeLists.txt
index ce894c6b942c5454e7b0aebbb8356f7794bb7430..53501cd2741a41ac5a5046f370badf0f1c6abf18 100644 (file)
--- a/ANALYSIS/ANALYSIScalib/CMakeLists.txt
+++ b/ANALYSIS/ANALYSIScalib/CMakeLists.txt
@@ -29,7 +29,6 @@ include_directories(${ROOT_INCLUDE_DIRS}
 # Sources in slphabetical order
 set(SRCS
     AliAnalysisTaskAddObject.cxx
-    AliAnalysisTaskCopyESD.cxx
     AliAnalysisTaskFilter.cxx
     AliAnalysisTaskFilterFriend.cxx
     AliAnalysisTaskFilterFriendSecond.cxx

diff --git a/ANALYSIS/CMakeLists.txt b/ANALYSIS/CMakeLists.txt
index 3b19633a7d2107a3e06a436e6641c8ec697f47a8..0afdf889455ae2b83314caae9b41e820b5656f3b 100644 (file)
--- a/ANALYSIS/CMakeLists.txt
+++ b/ANALYSIS/CMakeLists.txt
@@ -1,10 +1,28 @@
-# AliRoot Build System CMakeLists for ANALYSIS
-#
-# Author: Johny Jose m(johny.jose@cern.ch)
-#         Port of previous Makefile build to cmake
+# **************************************************************************
+# * 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.                  *
+# **************************************************************************
 
-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
+add_subdirectory(ANALYSIS)
+add_subdirectory(ANALYSISalice)
+add_subdirectory(ANALYSIScalib)
+add_subdirectory(Tender)
+add_subdirectory(TenderSupplies)
+add_subdirectory(ESDfilter)
+add_subdirectory(EventMixing)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Installing the macros
+install(DIRECTORY macros
+        DESTINATION ANALYSIS)
 
-ALICE_BuildModule()
+message(STATUS "ANALYSIS enabled")

diff --git a/ANALYSIS/CMakelibANALYSIS.pkg b/ANALYSIS/CMakelibANALYSIS.pkg
deleted file mode 100644 (file)
index fae62d3..0000000
--- a/ANALYSIS/CMakelibANALYSIS.pkg
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for ANALYSIS                                                      #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  
-    AliAnalysisDataContainer.cxx 
-    AliAnalysisDataSlot.cxx 
-    AliAnalysisManager.cxx 
-    AliAnalysisTask.cxx 
-    AliAnalysisSelector.cxx 
-    AliAnalysisGrid.cxx 
-    AliAnalysisStatistics.cxx 
-    AliAnalysisTaskCfg.cxx
-    AliXMLParser.cxx
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  ANALYSISLinkDef.h)
-
-set (EXPORT ${HDRS})
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEERBase)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
-
-install (DIRECTORY macros
-        DESTINATION ANALYSIS
-        PATTERN ".svn" EXCLUDE 
-         PATTERN ".d"   EXCLUDE 
-        PATTERN ".so"  EXCLUDE)

diff --git a/ANALYSIS/CMakelibANALYSISalice.pkg b/ANALYSIS/CMakelibANALYSISalice.pkg
deleted file mode 100644 (file)
index fea1137..0000000
--- a/ANALYSIS/CMakelibANALYSISalice.pkg
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for ANALYSISalice                                                 #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS     
-    AliAnalysisTaskSE.cxx 
-    AliAnalysisTaskME.cxx 
-    AliAnalysisTaskMCParticleFilter.cxx 
-    AliKineTrackCuts.cxx 
-    AliESDtrackCuts.cxx 
-    AliESDpidCuts.cxx 
-    AliESDv0Cuts.cxx 
-    AliEventPoolOTF.cxx 
-    AliEventPoolLoop.cxx 
-    AliEventPoolSparse.cxx 
-    AliAnalysisTaskTagCreator.cxx 
-    AliMultiEventInputHandler.cxx 
-    AliTriggerAnalysis.cxx 
-    AliPhysicsSelection.cxx 
-    AliBackgroundSelection.cxx 
-    AliPhysicsSelectionTask.cxx 
-    AliAnalysisFilter.cxx 
-    AliAnalysisCuts.cxx 
-    AliCollisionNormalization.cxx 
-    AliCollisionNormalizationTask.cxx 
-    AliCentralitySelectionTask.cxx 
-    AliEPSelectionTask.cxx 
-    AliVZEROEPSelectionTask.cxx 
-    AliAnalysisTaskStat.cxx 
-    AliMultiInputEventHandler.cxx 
-    AliESDv0KineCuts.cxx 
-    AliAnalysisTaskPIDResponse.cxx 
-    AliPIDResponseInputHandler.cxx 
-    AliHEPDataParser.cxx 
-    AliAnalysisTaskPIDqa.cxx 
-    AliAnalysisTaskBaseLine.cxx
-    AliEventPoolManager.cxx
-    AliAnalysisTaskPIDCombined.cxx
-    AliUnfolding.cxx
-    AliAnalysisUtils.cxx
-    BadChunkFilter/AliAnalysisTaskBadChunkID.cxx
-    AliAODv0KineCuts.cxx
-    AliPPVsMultUtils.cxx
-    )
-
-if( ROOTHASALIEN STREQUAL "yes")
-       
-       set ( PACKCXXFLAGS  "${CXXFLAGS} -DWITHALIEN")
-
-endif( ROOTHASALIEN STREQUAL "yes")
-
-if( ROOTHASXML STREQUAL "yes")
-       
-       set ( PACKCXXFLAGS "${PACKCXXFLAGS}  ${CXXFLAGS} -DWITHXML")
-       set ( CINTFLAGS ${CINTFLAGS}  -DWITHXML)
-       set ( SRCS ${SRCS}  AliTagAnalysis.cxx AliXMLCollection.cxx AliAnalysisAlien.cxx)
-
-endif( ROOTHASXML STREQUAL "yes")
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  ANALYSISaliceLinkDef.h)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE ANALYSIS/Aliengui STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS/BadChunkFilter)
-
-set ( ELIBS "OADB" )

diff --git a/ANALYSIS/CMakelibANALYSIScalib.pkg b/ANALYSIS/CMakelibANALYSIScalib.pkg
deleted file mode 100644 (file)
index 584253e..0000000
--- a/ANALYSIS/CMakelibANALYSIScalib.pkg
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for ANALYSIScalib                                                 #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  
-    AliAnalysisTaskFilter.cxx 
-    AliAnalysisTaskFilterFriend.cxx 
-    AliAnalysisTaskFilterFriendSecond.cxx 
-    AliAnalysisTaskAddObject.cxx 
-    AliAnalysisTaskFilterSteer.cxx 
-    AliFileMerger.cxx 
-    )
-
-if( ROOTHASALIEN STREQUAL "yes")
-       
-       set ( PACKCXXFLAGS  "${CXXFLAGS} -DWITHALIEN")
-       
-endif( ROOTHASALIEN STREQUAL "yes")
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  ANALYSIScalibLinkDef.h)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE ANALYSIS/Aliengui)

diff --git a/ANALYSIS/CMakelibESDfilter.pkg b/ANALYSIS/CMakelibESDfilter.pkg
deleted file mode 100644 (file)
index 439b11c..0000000
--- a/ANALYSIS/CMakelibESDfilter.pkg
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- mode: Makefile -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWGmuon                                                      #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS 
-    ESDfilter/AliAnalysisTaskESDfilter.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( DHDR  ESDfilterLinkDef.h)
-
-set ( EINCLUDE ANALYSIS/ESDfilter EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)

diff --git a/ANALYSIS/CMakelibEventMixing.pkg b/ANALYSIS/CMakelibEventMixing.pkg
deleted file mode 100644 (file)
index af08a6a..0000000
--- a/ANALYSIS/CMakelibEventMixing.pkg
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for TENDER                                                        #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS 
-  EventMixing/AliMixEventCutObj.cxx
-  EventMixing/AliMixEventPool.cxx
-  EventMixing/AliMixInfo.cxx
-  EventMixing/AliMixInputHandlerInfo.cxx
-  EventMixing/AliMixInputEventHandler.cxx
-  EventMixing/AliAnalysisTaskMixInfo.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  EventMixingLinkDef.h)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE  ANALYSIS ANALYSIS/EventMixing STEER/STEERBase)

diff --git a/ANALYSIS/CMakelibTENDER.pkg b/ANALYSIS/CMakelibTENDER.pkg
deleted file mode 100644 (file)
index 07cdb38..0000000
--- a/ANALYSIS/CMakelibTENDER.pkg
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for TENDER                                                        #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  
-    Tender/AliTender.cxx 
-    Tender/AliTenderSupply.cxx 
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  TenderLinkDef.h)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE  CORRFW ANALYSIS ANALYSIS/Tender STEER/STEERBase)

diff --git a/ANALYSIS/CMakelibTENDERSupplies.pkg b/ANALYSIS/CMakelibTENDERSupplies.pkg
deleted file mode 100644 (file)
index 1b52139..0000000
--- a/ANALYSIS/CMakelibTENDERSupplies.pkg
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for TENDERSupplies                                                #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  
-      TenderSupplies/AliTOFTenderSupply.cxx 
-      TenderSupplies/AliPIDTenderSupply.cxx   
-      TenderSupplies/AliTPCTenderSupply.cxx 
-      TenderSupplies/AliTRDTenderSupply.cxx 
-      TenderSupplies/AliVtxTenderSupply.cxx 
-      TenderSupplies/AliVZEROTenderSupply.cxx 
-      TenderSupplies/AliEMCALTenderSupply.cxx 
-      TenderSupplies/AliPHOSTenderSupply.cxx
-      TenderSupplies/AliHMPIDTenderSupply.cxx
-      TenderSupplies/AliT0TenderSupply.cxx 
-      TenderSupplies/AliTrackFixTenderSupply.cxx 
-      TenderSupplies/AliAnalysisTaskVZEROEqFactorTask.cxx 
-)
-
-string ( REPLACE ".cxx" ".h"  HDRS "${SRCS}")
-
-set ( DHDR  TenderSuppliesLinkDef.h)
-
-set ( EINCLUDE  ANALYSIS ANALYSIS/Tender ANALYSIS/TenderSupplies TOF TRD/Cal VZERO TPC TRD T0 OADB EMCAL PHOS STEER/STEER STEER/CDB STEER/ESD STEER/AOD STEER/STEERBase TPC/Base)

diff --git a/ANALYSIS/ESDfilter/CMakeLists.txt b/ANALYSIS/ESDfilter/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b3037dc
--- /dev/null
+++ b/ANALYSIS/ESDfilter/CMakeLists.txt
@@ -0,0 +1,61 @@
+# **************************************************************************
+# * 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 ESDfilter)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/ANALYSIS/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${CMAKE_SOURCE_DIR}/EMCAL
+                    ${CMAKE_SOURCE_DIR}/OADB
+                    ${CMAKE_SOURCE_DIR}/STEER/AOD
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources
+set(SRCS
+    AliAnalysisTaskESDfilter.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}")
+
+# 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/ANALYSIS/ESDfilterLinkDef.h b/ANALYSIS/ESDfilter/ESDfilterLinkDef.h
similarity index 100%
rename from ANALYSIS/ESDfilterLinkDef.h
rename to ANALYSIS/ESDfilter/ESDfilterLinkDef.h

diff --git a/ANALYSIS/EventMixing/CMakeLists.txt b/ANALYSIS/EventMixing/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ed1ee9d
--- /dev/null
+++ b/ANALYSIS/EventMixing/CMakeLists.txt
@@ -0,0 +1,64 @@
+# **************************************************************************
+# * 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 EventMixing)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/ANALYSIS/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${CMAKE_SOURCE_DIR}/STEER/AOD
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources
+set(SRCS
+    AliAnalysisTaskMixInfo.cxx
+    AliMixEventCutObj.cxx
+    AliMixEventPool.cxx
+    AliMixInfo.cxx
+    AliMixInputEventHandler.cxx
+    AliMixInputHandlerInfo.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}")
+
+# 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/ANALYSIS/EventMixingLinkDef.h b/ANALYSIS/EventMixing/EventMixingLinkDef.h
similarity index 100%
rename from ANALYSIS/EventMixingLinkDef.h
rename to ANALYSIS/EventMixing/EventMixingLinkDef.h

diff --git a/ANALYSIS/Tender/CMakeLists.txt b/ANALYSIS/Tender/CMakeLists.txt
new file mode 100644 (file)
index 0000000..aca1dfe
--- /dev/null
+++ b/ANALYSIS/Tender/CMakeLists.txt
@@ -0,0 +1,61 @@
+# **************************************************************************
+# * 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 Tender)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/ANALYSIS/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${CMAKE_SOURCE_DIR}/STEER/CDB
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliTender.cxx
+    AliTenderSupply.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}")
+
+# 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)
+

diff --git a/ANALYSIS/TenderLinkDef.h b/ANALYSIS/Tender/TenderLinkDef.h
similarity index 100%
rename from ANALYSIS/TenderLinkDef.h
rename to ANALYSIS/Tender/TenderLinkDef.h

diff --git a/ANALYSIS/TenderSupplies/CMakeLists.txt b/ANALYSIS/TenderSupplies/CMakeLists.txt
new file mode 100644 (file)
index 0000000..72869de
--- /dev/null
+++ b/ANALYSIS/TenderSupplies/CMakeLists.txt
@@ -0,0 +1,98 @@
+# **************************************************************************
+# * 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 TenderSupplies)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/ANALYSIS/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${CMAKE_SOURCE_DIR}/ANALYSIS/Tender
+                    ${CMAKE_SOURCE_DIR}/EMCAL
+                    ${CMAKE_SOURCE_DIR}/EMCAL/EMCALbase
+                    ${CMAKE_SOURCE_DIR}/EMCAL/EMCALrec
+                    ${CMAKE_SOURCE_DIR}/EMCAL/EMCALUtils
+                    ${CMAKE_SOURCE_DIR}/CORRFW
+                    ${CMAKE_SOURCE_DIR}/OADB
+                    ${CMAKE_SOURCE_DIR}/PHOS
+                    ${CMAKE_SOURCE_DIR}/PHOS/PHOSbase
+                    ${CMAKE_SOURCE_DIR}/PHOS/PHOSrec
+                    ${CMAKE_SOURCE_DIR}/PHOS/PHOSUtils
+                    ${CMAKE_SOURCE_DIR}/STEER/AOD
+                    ${CMAKE_SOURCE_DIR}/STEER/CDB
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                    ${CMAKE_SOURCE_DIR}/T0
+                    ${CMAKE_SOURCE_DIR}/T0/T0rec
+                    ${CMAKE_SOURCE_DIR}/TOF/
+                    ${CMAKE_SOURCE_DIR}/TOF/TOFbase
+                    ${CMAKE_SOURCE_DIR}/TOF/TOFrec
+                    ${CMAKE_SOURCE_DIR}/TPC
+                    ${CMAKE_SOURCE_DIR}/TPC/Base
+                    ${CMAKE_SOURCE_DIR}/TPC/TPCbase
+                    ${CMAKE_SOURCE_DIR}/TRD
+                    ${CMAKE_SOURCE_DIR}/TRD/Cal
+                    ${CMAKE_SOURCE_DIR}/TRD/TRDbase
+                    ${CMAKE_SOURCE_DIR}/VZERO
+                    ${CMAKE_SOURCE_DIR}/VZERO/VZERObase
+                    ${CMAKE_SOURCE_DIR}/VZERO/VZEROrec
+                   )
+
+# Sources
+set(SRCS
+    AliAnalysisTaskVZEROEqFactorTask.cxx
+    AliEMCALTenderSupply.cxx
+    AliHMPIDTenderSupply.cxx
+    AliPHOSTenderSupply.cxx
+    AliPIDTenderSupply.cxx
+    AliT0TenderSupply.cxx
+    AliTOFTenderSupply.cxx
+    AliTPCTenderSupply.cxx
+    AliTrackFixTenderSupply.cxx
+    AliTRDTenderSupply.cxx
+    AliVtxTenderSupply.cxx
+    AliVZEROTenderSupply.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}")
+
+# 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)
+

diff --git a/ANALYSIS/TenderSuppliesLinkDef.h b/ANALYSIS/TenderSupplies/TenderSuppliesLinkDef.h
similarity index 100%
rename from ANALYSIS/TenderSuppliesLinkDef.h
rename to ANALYSIS/TenderSupplies/TenderSuppliesLinkDef.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec3e840a79d94025d073e7a0e04bca86cbb59a13..ae7a5a8053e5593f5e94ce7cfa875b75154dd7f1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,11 @@ include(CMakeALICE)
 # ROOT configuration mandatory
 if(ROOTSYS)
     find_package(ROOT REQUIRED)
+
+    # ROOT must be build with XML2 support
+    if(ROOT_HASXML STREQUAL "no")
+        message(FATAL_ERROR "ROOT was not build with xml2 support. Please reinstall or rebuild ROOT with xml2 support")
+    endif(ROOT_HASXML STREQUAL "no")
 else()
     message(FATAL_ERROR "ROOT installation not found!\nPlease point to the ROOT installation using -DROOTSYS=ROOT_INSTALL_DIR")
 endif(ROOTSYS)

diff --git a/STEER/STEER/CMakeLists.txt b/STEER/STEER/CMakeLists.txt
index cc9c252a946de5158efa7e75509052adcc662542..30bf104e2786f4c40d34897393cd55f3e04cd602 100644 (file)
--- a/STEER/STEER/CMakeLists.txt
+++ b/STEER/STEER/CMakeLists.txt
@@ -21,7 +21,6 @@ include_directories(${CMAKE_SOURCE_DIR}/STEER/${MODULE})
 
 # Additional include directories - alphabetical order except ROOT
 include_directories(${ROOT_INCLUDE_DIRS}
-                    ${CMAKE_SOURCE_DIR}/ANALYSIS/
                     ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${CMAKE_SOURCE_DIR}/HLT/sim
                     ${CMAKE_SOURCE_DIR}/RAW/