Fix after sync with master and PYTHIA6 module
authoragrigora <alina.grigoras@cern.ch>
Tue, 21 Oct 2014 10:00:32 +0000 (12:00 +0200)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:50 +0000 (13:51 +0100)
15 files changed:
OADB/CMakeLists.txt
PYTHIA6/CMakeLists.txt
PYTHIA6/CMakelibAliPythia6.pkg [deleted file]
PYTHIA6/CMakelibpythia6.4.21.pkg [deleted file]
PYTHIA6/CMakelibpythia6.4.25.pkg [deleted file]
PYTHIA6/CMakelibpythia6.pkg [deleted file]
PYTHIA6/CMakelibqpythia.pkg [deleted file]
PYTHIA6/QPYTHIA/CMakeLists.txt [new file with mode: 0644]
PYTHIA6/pythia6.4.21/CMakeLists.txt [new file with mode: 0644]
PYTHIA6/pythia6.4.25/CMakeLists.txt [new file with mode: 0644]
PYTHIA6/pythia6/pyevwt.f [moved from PYTHIA6/pyevwt.f with 100% similarity]
PYTHIA6/pythia6/pythia6.inc [moved from PYTHIA6/pythia6.inc with 100% similarity]
TOF/TOFcalib/AliTOFAnalysisTaskCalibTree.cxx [moved from TOF/AliTOFAnalysisTaskCalibTree.cxx with 100% similarity]
TOF/TOFcalib/AliTOFAnalysisTaskCalibTree.h [moved from TOF/AliTOFAnalysisTaskCalibTree.h with 100% similarity]
TOF/TOFcalib/CMakeLists.txt

index 3bb3d44..bb00be9 100644 (file)
@@ -64,4 +64,14 @@ install(TARGETS ${MODULE}
   LIBRARY DESTINATION lib)
 install(FILES ${HDRS} DESTINATION include)
 
+install(DIRECTORY COMMON
+                  EMCAL
+                  PHOS
+                  PWG
+                  PWGPP
+                  PWGLF
+                  PWGJE
+                  PWGLF
+        DESTINATION OADB)
+
 message(STATUS "${MODULE} enabled")
index afb430e..0784718 100644 (file)
@@ -15,6 +15,6 @@
 
 add_subdirectory(pythia6)
 add_subdirectory(AliPythia6)
-add_subdirectory(pythia6_4_21)
-add_subdirectory(pythia6_4_25)
+add_subdirectory(pythia6.4.21)
+add_subdirectory(pythia6.4.25)
 add_subdirectory(QPYTHIA)
diff --git a/PYTHIA6/CMakelibAliPythia6.pkg b/PYTHIA6/CMakelibAliPythia6.pkg
deleted file mode 100644 (file)
index 6e9875f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for AliPythia6                                                    #
-# 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  
-    AliPythiaBase.cxx 
-    AliPythia.cxx 
-    AliPythia6.cxx 
-    AliGenPythia.cxx 
-    AliGenPythiaPlus.cxx 
-    AliDecayerPythia.cxx 
-    )
-
-set ( FSRCS  openDecayTable.F)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR AliPythia6LinkDef.h)
-
-set ( EXPORT AliPythiaBase.h AliPythia.h AliDecayerPythia.h)
-
-set ( EINCLUDE FASTSIM LHAPDF EVGEN STEER/STEER STEER/STEERBase)
diff --git a/PYTHIA6/CMakelibpythia6.4.21.pkg b/PYTHIA6/CMakelibpythia6.4.21.pkg
deleted file mode 100644 (file)
index 3718bc7..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for pythia6.4.21                                                  #
-# 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  pythia6.4.21/AliPythia64Rndm.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR pythia6.4.21/pythia64LinkDef.h)
-
-set ( EXPORT )
-
-set ( CSRCS  pythia6.4.21/main.c pythia6.4.21/pythia6_common_address.c)
-
-set ( EINCLUDE PYTHIA6/QPYTHIA)
-
-set ( FSRCS  pythia6.4.21/pythia6_common_block_address.F pythia6.4.21/tpythia6_called_from_cc.F pythia6.4.21/pythia-6.4.21.f pyevwt.f QPYTHIA/pyquen1_5.F)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lmicrocern -llhapdf)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
diff --git a/PYTHIA6/CMakelibpythia6.4.25.pkg b/PYTHIA6/CMakelibpythia6.4.25.pkg
deleted file mode 100644 (file)
index 16357dd..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for pythia6.4.21                                                  #
-# 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  pythia6.4.21/AliPythia64Rndm.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR pythia6.4.25/pythia6425LinkDef.h)
-
-set ( EXPORT )
-
-set ( CSRCS  pythia6.4.25/main.c pythia6.4.25/pythia6_common_address.c)
-
-set ( FSRCS  pythia6.4.25/pythia6_common_block_address.F pythia6.4.25/tpythia6_called_from_cc.F pythia6.4.25/pythia-6.4.25.f pythia6.4.25/pydummy_6.4.25.f POWHEG-BOX/setup-PYTHIA-lhef.f POWHEG-BOX/lhefread.f pyevwt.f)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lmicrocern -llhapdf)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
diff --git a/PYTHIA6/CMakelibpythia6.pkg b/PYTHIA6/CMakelibpythia6.pkg
deleted file mode 100644 (file)
index c5e0854..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for pythia6                                                       #
-# 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  
-AliPythiaRndm.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR pythia6LinkDef.h)
-
-set ( EXPORT )
-
-set ( CSRCS  main.c pythia6_common_address.c)
-
-set ( FSRCS  pythia6_common_block_address.F tpythia6_called_from_cc.F pythia6214.f pyevwt.f pydummy.f pdf_alice.F)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lmicrocern -llhapdf)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
diff --git a/PYTHIA6/CMakelibqpythia.pkg b/PYTHIA6/CMakelibqpythia.pkg
deleted file mode 100644 (file)
index f768bc6..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for qpythia                                                       #
-# 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  QPYTHIA/AliQPythiaWrapper.cxx QPYTHIA/AliQPythiaRndm.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR QPYTHIA/qpythiaLinkDef.h)
-
-set ( EXPORT )
-
-set ( CSRCS  QPYTHIA/main.c QPYTHIA/pythia6_common_address.c)
-
-set ( EINCLUDE FASTSIM PYTHIA6/QPYTHIA)
-
-set ( FSRCS  QPYTHIA/pythia6_common_block_address.F QPYTHIA/pythia6_called_from_cc.F QPYTHIA/pythia-6.4.14.f pyevwt.f QPYTHIA/pyquen1_5.F QPYTHIA/q-pyshow.1.2.F)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lmicrocern -llhapdf)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
diff --git a/PYTHIA6/QPYTHIA/CMakeLists.txt b/PYTHIA6/QPYTHIA/CMakeLists.txt
new file mode 100644 (file)
index 0000000..08c173e
--- /dev/null
@@ -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 qpythia)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/PYTHIA6/QPYTHIA)
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/FASTSIM
+                    ${CMAKE_SOURCE_DIR}/PYTHIA6/pythia6
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliQPythiaWrapper.cxx
+    AliQPythiaRndm.cxx
+   )
+
+# Fortran sources
+set(FSRCS
+    pythia6_common_block_address.F
+    pythia6_called_from_cc.F
+    pythia-6.4.14.f
+    pyquen1_5.F
+    q-pyshow.1.2.F
+    ${CMAKE_SOURCE_DIR}/PYTHIA6/pythia6/pyevwt.f
+   )
+
+# C sources
+set(CSRCS
+    main.c
+    pythia6_common_address.c
+   )
+
+# 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}" "qpythiaLinkDef.h" "${HDRS}" "${incdirs}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS pythia6 FASTSIM)
+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 ${FSRCS} ${CSRCS})
+
+# 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/PYTHIA6/pythia6.4.21/CMakeLists.txt b/PYTHIA6/pythia6.4.21/CMakeLists.txt
new file mode 100644 (file)
index 0000000..90fccaa
--- /dev/null
@@ -0,0 +1,77 @@
+# **************************************************************************
+# * 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 pythia6.4.21)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/PYTHIA6/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/PYTHIA6/pythia6
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliPythia64Rndm.cxx
+   )
+
+# Fortran sources
+set(FSRCS
+    pythia6_common_block_address.F
+    tpythia6_called_from_cc.F
+    pythia-6.4.21.f
+    ${CMAKE_SOURCE_DIR}/PYTHIA6//pythia6/pyevwt.f
+    ${CMAKE_SOURCE_DIR}/PYTHIA6/QPYTHIA/pyquen1_5.F
+   )
+
+# C sources
+set(CSRCS
+    main.c
+    pythia6_common_address.c
+   )
+
+# 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}" "pythia64LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS pythia6)
+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 ${FSRCS} ${CSRCS})
+
+# 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/PYTHIA6/pythia6.4.25/CMakeLists.txt b/PYTHIA6/pythia6.4.25/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fb7b8cf
--- /dev/null
@@ -0,0 +1,79 @@
+# **************************************************************************
+# * 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 pythia6.4.25)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/PYTHIA6/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/PYTHIA6/pythia6
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+     ${CMAKE_SOURCE_DIR}/PYTHIA6/pythia6.4.21/AliPythia64Rndm.cxx
+   )
+
+# Fortran sources
+set(FSRCS
+    pythia6_common_block_address.F
+    tpythia6_called_from_cc.F
+    pythia-6.4.25.f
+    pydummy_6.4.25.f
+    ${CMAKE_SOURCE_DIR}/PYTHIA6/POWHEG-BOX/setup-PYTHIA-lhef.f
+    ${CMAKE_SOURCE_DIR}/PYTHIA6/POWHEG-BOX/lhefread.f 
+    ${CMAKE_SOURCE_DIR}/PYTHIA6/pythia6/pyevwt.f
+   )
+
+# C sources
+set(CSRCS
+    main.c
+    pythia6_common_address.c
+   )
+
+# 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}" "pythia6425LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS pythia6)
+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 ${FSRCS} ${CSRCS})
+
+# 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
similarity index 100%
rename from PYTHIA6/pyevwt.f
rename to PYTHIA6/pythia6/pyevwt.f
index 4e20a09..29ab550 100644 (file)
@@ -23,16 +23,19 @@ include_directories(${CMAKE_SOURCE_DIR}/TOF/${MODULE})
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${CMAKE_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${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}/TOF/TOFbase
+                    ${CMAKE_SOURCE_DIR}/TOF/TOFrec
                    )
 
 # Sources in alphabetical order
 set(SRCS
     AliTOFAnalysisTaskCalibPass0.cxx
+    AliTOFAnalysisTaskCalibTree.cxx
    )
 
 # Headers from sources
@@ -45,7 +48,7 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
 # Generate the ROOT map
 # Dependecies
-set(LIBDEPS STEERBase STEER CDB ESD ANALYSIS ANALYSISalice TOFbase)
+set(LIBDEPS STEERBase STEER CDB ESD AOD ANALYSIS ANALYSISalice TOFbase TOFrec)
 generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")