]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
FASTJETAN module
authoragrigora <alina.grigoras@cern.ch>
Thu, 6 Nov 2014 14:24:07 +0000 (15:24 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:53 +0000 (13:51 +0100)
24 files changed:
JETAN/CMakeLists.txt
JETAN/CMakelibFASTJETAN.pkg [deleted file]
JETAN/CMakelibJETAN.pkg [deleted file]
JETAN/FASTJETAN/AliAnalysisTaskJetBackgroundSubtract.cxx [moved from JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx with 100% similarity]
JETAN/FASTJETAN/AliAnalysisTaskJetBackgroundSubtract.h [moved from JETAN/AliAnalysisTaskJetBackgroundSubtract.h with 100% similarity]
JETAN/FASTJETAN/AliAnalysisTaskJetCluster.cxx [moved from JETAN/AliAnalysisTaskJetCluster.cxx with 100% similarity]
JETAN/FASTJETAN/AliAnalysisTaskJetCluster.h [moved from JETAN/AliAnalysisTaskJetCluster.h with 100% similarity]
JETAN/FASTJETAN/AliAnalysisTaskJetClusterKine.cxx [moved from JETAN/AliAnalysisTaskJetClusterKine.cxx with 100% similarity]
JETAN/FASTJETAN/AliAnalysisTaskJetClusterKine.h [moved from JETAN/AliAnalysisTaskJetClusterKine.h with 100% similarity]
JETAN/FASTJETAN/AliFastJetBkg.cxx [moved from JETAN/AliFastJetBkg.cxx with 100% similarity]
JETAN/FASTJETAN/AliFastJetBkg.h [moved from JETAN/AliFastJetBkg.h with 98% similarity]
JETAN/FASTJETAN/AliFastJetFinder.cxx [moved from JETAN/AliFastJetFinder.cxx with 100% similarity]
JETAN/FASTJETAN/AliFastJetFinder.h [moved from JETAN/AliFastJetFinder.h with 100% similarity]
JETAN/FASTJETAN/AliFastJetHeaderV1.cxx [moved from JETAN/AliFastJetHeaderV1.cxx with 100% similarity]
JETAN/FASTJETAN/AliFastJetHeaderV1.h [moved from JETAN/AliFastJetHeaderV1.h with 100% similarity]
JETAN/FASTJETAN/AliFastJetInput.cxx [moved from JETAN/AliFastJetInput.cxx with 100% similarity]
JETAN/FASTJETAN/AliFastJetInput.h [moved from JETAN/AliFastJetInput.h with 100% similarity]
JETAN/FASTJETAN/AliSISConeJetFinder.cxx [moved from JETAN/AliSISConeJetFinder.cxx with 100% similarity]
JETAN/FASTJETAN/AliSISConeJetFinder.h [moved from JETAN/AliSISConeJetFinder.h with 100% similarity]
JETAN/FASTJETAN/AliSISConeJetHeader.cxx [moved from JETAN/AliSISConeJetHeader.cxx with 100% similarity]
JETAN/FASTJETAN/AliSISConeJetHeader.h [moved from JETAN/AliSISConeJetHeader.h with 100% similarity]
JETAN/FASTJETAN/CMakeLists.txt [new file with mode: 0644]
JETAN/FASTJETAN/FASTJETANLinkDef.h [moved from JETAN/FASTJETANLinkDef.h with 100% similarity]
JETAN/JETAN/CMakeLists.txt

index 418507eb5ed1bc73459120d2221f9640e66eb58e..ed125b29f3d5bd508ac5231b858792ff617cf63f 100644 (file)
@@ -16,7 +16,7 @@
 add_subdirectory(JETAN)
 if(FASTJET_FOUND)
     message(STATUS "FastJet found. Enabling FASTJETAN")
-#    add_subdirectory(FASTJETAN)
+    add_subdirectory(FASTJETAN)
 endif(FASTJET_FOUND)
 
 # Installing the macros
diff --git a/JETAN/CMakelibFASTJETAN.pkg b/JETAN/CMakelibFASTJETAN.pkg
deleted file mode 100644 (file)
index 457a574..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for JETAN                                                         #
-# 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 AliFastJetFinder.cxx AliFastJetHeaderV1.cxx AliFastJetInput.cxx AliFastJetBkg.cxx AliSISConeJetFinder.cxx AliSISConeJetHeader.cxx AliAnalysisTaskJetCluster.cxx AliAnalysisTaskJetClusterKine.cxx AliAnalysisTaskJetBackgroundSubtract.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  FASTJETANLinkDef.h)
-
-set ( EDEFINE -isystem${FASTJET_INCLUDE_DIR} ) # Not sure whether we need this...
-set ( EINCLUDE ${FASTJET_INCLUDE_DIR} ANALYSIS STEER/AOD STEER/STEERBase )
-
diff --git a/JETAN/CMakelibJETAN.pkg b/JETAN/CMakelibJETAN.pkg
deleted file mode 100644 (file)
index 75f1343..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for JETAN                                                         #
-# 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 
-AliJetHeader.cxx 
-AliJetFinder.cxx  
-AliJetReaderHeader.cxx 
-AliJetReader.cxx 
-AliUA1JetHeaderV1.cxx 
-AliUA1JetFinder.cxx 
-AliCdfJetFinder.cxx  
-AliCdfJetHeader.cxx 
-AliAnalysisTaskJetsReader.cxx  
-AliAnalysisTaskJetsFinder.cxx 
-AliDAJetFinder.cxx AliDAJetHeader.cxx 
-AliJetKineReaderHeader.cxx 
-AliJetHistos.cxx 
-AliAnalysisTaskDiJets.cxx 
-AliEventShape.cxx 
-AliKMeansClustering.cxx 
-AliAnalysisTaskKMeans.cxx 
-AliAnalysisTaskFastEmbedding.cxx 
-AliJetBkg.cxx 
-AliJetCalTrk.cxx 
-AliJetFillCalTrkTrack.cxx 
-AliJetFillCalTrkTrackMC.cxx 
-AliJetFillCalTrkEvent.cxx 
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  JETANLinkDef.h)
-
-set(FASTJET_ROOT $ENV{FASTJET_ROOT})
-
-if(FASTJET_ROOT)
-  set (FASTJET_INC ${FASTJET_ROOT}/include)
-else()
-  set (FASTJET_INC ${ALICE_ROOT}/JETAN/fastjet)
-endif(FASTJET_ROOT)
-
-set ( EDEFINE -isystem${FASTJET_INC})
-
-set ( EINCLUDE  ANALYSIS  OADB STEER/STEERBase STEER/AOD STEER/ESD EMCAL)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-                       set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEERBase -lESD -lAOD -lANALYSIS -lANALYSISalice -L${ROOTLIBDIR} -lEG -lGeom)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
-
similarity index 98%
rename from JETAN/AliFastJetBkg.h
rename to JETAN/FASTJETAN/AliFastJetBkg.h
index c776d7e5b6a87c84f47a53df0321714bb59861ee..eeb19e333af4fd4af70e4fd42c0daf07ef113408 100644 (file)
@@ -15,6 +15,7 @@
 // 2011 :
 // renamed from AliJetBkg to AliFastJetBkg as this class uses only FASTJET based algos        
 //---------------------------------------------------------------------
+#include "fastjet/PseudoJet.hh"
 #ifdef __CINT__
 namespace fastjet {
   class PsuedoJet;
diff --git a/JETAN/FASTJETAN/CMakeLists.txt b/JETAN/FASTJETAN/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4c52e86
--- /dev/null
@@ -0,0 +1,81 @@
+# **************************************************************************
+# * 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 FASTJETAN)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/JETAN/${MODULE})
+
+# Additional include folders in alphabetical order
+include_directories(${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/JETAN/JETAN
+                    ${AliRoot_SOURCE_DIR}/STEER/AOD
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliAnalysisTaskJetBackgroundSubtract.cxx
+    AliAnalysisTaskJetCluster.cxx
+    AliAnalysisTaskJetClusterKine.cxx
+    AliFastJetBkg.cxx
+    AliFastJetFinder.cxx
+    AliFastJetHeaderV1.cxx
+    AliFastJetInput.cxx
+    AliSISConeJetFinder.cxx
+    AliSISConeJetHeader.cxx
+   )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+if(FASTJET_FOUND)
+    include_directories(${FASTJET_INCLUDE_DIR})
+    link_directories(${FASTJET_LIBS_DIR})
+    add_definitions(${FASTJET_DEFINITIONS})
+endif(FASTJET_FOUND)
+
+
+# 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 ESD AOD ANALYSIS ANALYSISalice JETAN EG Net)
+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} ${FASTJET_LIBS})
+
+# 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
index cc27d0cd81f4650442cccf2b4f384326c89ea0d3..e2c63833e43d1ccbfb5fa2e7b17264d357e186be 100644 (file)
@@ -67,7 +67,7 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
 # Generate the ROOT map
 # Dependecies
-set(LIBDEPS STEERBase ESD AOD ANALYSIS ANALYSISalice EMCALUtils)
+set(LIBDEPS STEERBase ESD AOD ANALYSIS ANALYSISalice EMCALUtils EG Eve MathMore Net Smatrix)
 generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
 
 # Add a library to the project using the specified source files