Partial Pythia to sync with master for missing files
authoragrigora <alina.grigoras@cern.ch>
Tue, 21 Oct 2014 08:59:14 +0000 (10:59 +0200)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:50 +0000 (13:51 +0100)
31 files changed:
CMakeLists.txt
PYTHIA6/AliPythia6/AliDecayerPythia.cxx [moved from PYTHIA6/AliDecayerPythia.cxx with 100% similarity]
PYTHIA6/AliPythia6/AliDecayerPythia.h [moved from PYTHIA6/AliDecayerPythia.h with 100% similarity]
PYTHIA6/AliPythia6/AliGenPythia.cxx [moved from PYTHIA6/AliGenPythia.cxx with 100% similarity]
PYTHIA6/AliPythia6/AliGenPythia.h [moved from PYTHIA6/AliGenPythia.h with 100% similarity]
PYTHIA6/AliPythia6/AliGenPythiaPlus.cxx [moved from PYTHIA6/AliGenPythiaPlus.cxx with 100% similarity]
PYTHIA6/AliPythia6/AliGenPythiaPlus.h [moved from PYTHIA6/AliGenPythiaPlus.h with 100% similarity]
PYTHIA6/AliPythia6/AliPythia.cxx [moved from PYTHIA6/AliPythia.cxx with 100% similarity]
PYTHIA6/AliPythia6/AliPythia.h [moved from PYTHIA6/AliPythia.h with 100% similarity]
PYTHIA6/AliPythia6/AliPythia6.cxx [moved from PYTHIA6/AliPythia6.cxx with 100% similarity]
PYTHIA6/AliPythia6/AliPythia6.h [moved from PYTHIA6/AliPythia6.h with 100% similarity]
PYTHIA6/AliPythia6/AliPythia6LinkDef.h [moved from PYTHIA6/AliPythia6LinkDef.h with 100% similarity]
PYTHIA6/AliPythia6/AliPythiaBase.cxx [moved from PYTHIA6/AliPythiaBase.cxx with 100% similarity]
PYTHIA6/AliPythia6/AliPythiaBase.h [moved from PYTHIA6/AliPythiaBase.h with 100% similarity]
PYTHIA6/AliPythia6/CMakeLists.txt [new file with mode: 0644]
PYTHIA6/AliPythia6/PyquenCommon.h [moved from PYTHIA6/PyquenCommon.h with 100% similarity]
PYTHIA6/AliPythia6/PythiaProcesses.h [moved from PYTHIA6/PythiaProcesses.h with 100% similarity]
PYTHIA6/AliPythia6/openDecayTable.F [moved from PYTHIA6/openDecayTable.F with 100% similarity]
PYTHIA6/CMakeLists.txt
PYTHIA6/CMakelibpythia6.pkg
PYTHIA6/pythia6/AliPythiaRndm.cxx [moved from PYTHIA6/AliPythiaRndm.cxx with 100% similarity]
PYTHIA6/pythia6/AliPythiaRndm.h [moved from PYTHIA6/AliPythiaRndm.h with 100% similarity]
PYTHIA6/pythia6/CMakeLists.txt [new file with mode: 0644]
PYTHIA6/pythia6/main.c [moved from PYTHIA6/main.c with 100% similarity]
PYTHIA6/pythia6/pdf_alice.F [moved from PYTHIA6/pdf_alice.F with 100% similarity]
PYTHIA6/pythia6/pydummy.f [moved from PYTHIA6/pydummy.f with 100% similarity]
PYTHIA6/pythia6/pythia6214.f [moved from PYTHIA6/pythia6214.f with 100% similarity]
PYTHIA6/pythia6/pythia6LinkDef.h [moved from PYTHIA6/pythia6LinkDef.h with 100% similarity]
PYTHIA6/pythia6/pythia6_common_address.c [moved from PYTHIA6/pythia6_common_address.c with 100% similarity]
PYTHIA6/pythia6/pythia6_common_block_address.F [moved from PYTHIA6/pythia6_common_block_address.F with 100% similarity]
PYTHIA6/pythia6/tpythia6_called_from_cc.F [moved from PYTHIA6/tpythia6_called_from_cc.F with 100% similarity]

index 5a1cbb0..0ea858f 100644 (file)
@@ -107,7 +107,7 @@ add_subdirectory(CORRFW)
 add_subdirectory(FASTSIM)
 if(CMAKE_Fortran_COMPILER)
   add_subdirectory (LHAPDF)
-#  add_subdirectory (PYTHIA6)
+  add_subdirectory (PYTHIA6)
 #  add_subdirectory (MICROCERN)
 endif(CMAKE_Fortran_COMPILER)
 #add_subdirectory (EVGEN)
diff --git a/PYTHIA6/AliPythia6/CMakeLists.txt b/PYTHIA6/AliPythia6/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0539ec8
--- /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 AliPythia6)
+
+# 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}/EVGEN
+                    ${CMAKE_SOURCE_DIR}/FASTSIM
+                    ${CMAKE_SOURCE_DIR}/LHAPDF
+                    ${CMAKE_SOURCE_DIR}/PYTHIA6/pythia6
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliDecayerPythia.cxx
+    AliGenPythia.cxx
+    AliGenPythiaPlus.cxx
+    AliPythia6.cxx
+    AliPythiaBase.cxx
+    AliPythia.cxx
+   )
+
+# Fortran sources
+set(FSRCS
+    openDecayTable.F
+   )
+
+# 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 pythia6 LHAPDF EVGEN 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})
+
+# 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 7c99f36..afb430e 100644 (file)
@@ -1,10 +1,20 @@
-# AliRoot Build System CMakeLists for PYTHIA6
-#
-# 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)
-
-file(GLOB PACKAGES CMake*.pkg)
-
-ALICE_BuildModule()
+add_subdirectory(pythia6)
+add_subdirectory(AliPythia6)
+add_subdirectory(pythia6_4_21)
+add_subdirectory(pythia6_4_25)
+add_subdirectory(QPYTHIA)
index 6eae043..c5e0854 100644 (file)
@@ -25,7 +25,9 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS  AliPythiaRndm.cxx)
+set ( SRCS  
+AliPythiaRndm.cxx
+)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
diff --git a/PYTHIA6/pythia6/CMakeLists.txt b/PYTHIA6/pythia6/CMakeLists.txt
new file mode 100644 (file)
index 0000000..824fce1
--- /dev/null
@@ -0,0 +1,76 @@
+# **************************************************************************
+# * 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)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/PYTHIA6/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliPythiaRndm.cxx
+   )
+
+# Fortran sources
+set(FSRCS
+    pythia6_common_block_address.F
+    tpythia6_called_from_cc.F
+    pythia6214.f
+    pyevwt.f pydummy.f
+    pdf_alice.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}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS)
+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/main.c
rename to PYTHIA6/pythia6/main.c
similarity index 100%
rename from PYTHIA6/pydummy.f
rename to PYTHIA6/pythia6/pydummy.f