AD module
authoragrigora <alina.grigoras@cern.ch>
Tue, 11 Nov 2014 10:46:15 +0000 (11:46 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:54 +0000 (13:51 +0100)
28 files changed:
AD/ADrec/ADrecLinkDef.h [moved from AD/ADrecLinkDef.h with 100% similarity]
AD/ADrec/AliADQADataMakerRec.cxx [moved from AD/AliADQADataMakerRec.cxx with 100% similarity]
AD/ADrec/AliADQADataMakerRec.h [moved from AD/AliADQADataMakerRec.h with 100% similarity]
AD/ADrec/AliADRawStream.cxx [moved from AD/AliADRawStream.cxx with 100% similarity]
AD/ADrec/AliADRawStream.h [moved from AD/AliADRawStream.h with 100% similarity]
AD/ADrec/AliADRecoParam.cxx [moved from AD/AliADRecoParam.cxx with 100% similarity]
AD/ADrec/AliADRecoParam.h [moved from AD/AliADRecoParam.h with 100% similarity]
AD/ADrec/AliADReconstructor.cxx [moved from AD/AliADReconstructor.cxx with 100% similarity]
AD/ADrec/AliADReconstructor.h [moved from AD/AliADReconstructor.h with 100% similarity]
AD/ADrec/AliADTrigger.cxx [moved from AD/AliADTrigger.cxx with 100% similarity]
AD/ADrec/AliADTrigger.h [moved from AD/AliADTrigger.h with 100% similarity]
AD/ADrec/CMakeLists.txt [new file with mode: 0644]
AD/ADsim/ADsimLinkDef.h [moved from AD/ADsimLinkDef.h with 100% similarity]
AD/ADsim/AliAD.cxx [moved from AD/AliAD.cxx with 100% similarity]
AD/ADsim/AliAD.h [moved from AD/AliAD.h with 100% similarity]
AD/ADsim/AliADBuffer.cxx [moved from AD/AliADBuffer.cxx with 100% similarity]
AD/ADsim/AliADBuffer.h [moved from AD/AliADBuffer.h with 100% similarity]
AD/ADsim/AliADDigitizer.cxx [moved from AD/AliADDigitizer.cxx with 100% similarity]
AD/ADsim/AliADDigitizer.h [moved from AD/AliADDigitizer.h with 100% similarity]
AD/ADsim/AliADQADataMakerSim.cxx [moved from AD/AliADQADataMakerSim.cxx with 100% similarity]
AD/ADsim/AliADQADataMakerSim.h [moved from AD/AliADQADataMakerSim.h with 100% similarity]
AD/ADsim/AliADhit.cxx [moved from AD/AliADhit.cxx with 100% similarity]
AD/ADsim/AliADhit.h [moved from AD/AliADhit.h with 100% similarity]
AD/ADsim/AliADv1.cxx [moved from AD/AliADv1.cxx with 100% similarity]
AD/ADsim/AliADv1.h [moved from AD/AliADv1.h with 100% similarity]
AD/ADsim/CMakeLists.txt [new file with mode: 0644]
AD/CMakelibADrec.pkg [deleted file]
AD/CMakelibADsim.pkg [deleted file]

similarity index 100%
rename from AD/ADrecLinkDef.h
rename to AD/ADrec/ADrecLinkDef.h
similarity index 100%
rename from AD/AliADTrigger.h
rename to AD/ADrec/AliADTrigger.h
diff --git a/AD/ADrec/CMakeLists.txt b/AD/ADrec/CMakeLists.txt
new file mode 100644 (file)
index 0000000..678c16a
--- /dev/null
@@ -0,0 +1,71 @@
+# **************************************************************************
+# * 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 ADrec)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/AD/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${AliRoot_SOURCE_DIR}/AD/ADbase
+                    ${AliRoot_SOURCE_DIR}/RAW/dateStream
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
+                    ${AliRoot_SOURCE_DIR}/STEER/CDB
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliADReconstructor.cxx
+    AliADTrigger.cxx
+    AliADRecoParam.cxx
+    AliADRawStream.cxx
+    AliADQADataMakerRec.cxx
+   )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+# Generate the dictionary
+# It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument
+get_directory_property(incdirs INCLUDE_DIRECTORIES)
+generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS STEERBase STEER ESD CDB RAWDatabase RAWDatarec ADbase Core Hist RIO Tree)
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Add a library to the project using the specified source files
+add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+
+# Additional compilation flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Installation
+install(TARGETS ${MODULE}
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib)
+
+install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
similarity index 100%
rename from AD/ADsimLinkDef.h
rename to AD/ADsim/ADsimLinkDef.h
similarity index 100%
rename from AD/AliAD.cxx
rename to AD/ADsim/AliAD.cxx
similarity index 100%
rename from AD/AliAD.h
rename to AD/ADsim/AliAD.h
similarity index 100%
rename from AD/AliADBuffer.cxx
rename to AD/ADsim/AliADBuffer.cxx
similarity index 100%
rename from AD/AliADBuffer.h
rename to AD/ADsim/AliADBuffer.h
similarity index 100%
rename from AD/AliADhit.cxx
rename to AD/ADsim/AliADhit.cxx
similarity index 100%
rename from AD/AliADhit.h
rename to AD/ADsim/AliADhit.h
similarity index 100%
rename from AD/AliADv1.cxx
rename to AD/ADsim/AliADv1.cxx
similarity index 100%
rename from AD/AliADv1.h
rename to AD/ADsim/AliADv1.h
diff --git a/AD/ADsim/CMakeLists.txt b/AD/ADsim/CMakeLists.txt
new file mode 100644 (file)
index 0000000..811332b
--- /dev/null
@@ -0,0 +1,72 @@
+# **************************************************************************
+# * 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 ADsim)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/AD/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${AliRoot_SOURCE_DIR}/AD/ADbase
+                    ${AliRoot_SOURCE_DIR}/AD/ADrec
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
+                    ${AliRoot_SOURCE_DIR}/STEER/CDB
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliAD.cxx
+    AliADv1.cxx
+    AliADhit.cxx
+    AliADDigitizer.cxx
+    AliADBuffer.cxx
+    AliADQADataMakerSim.cxx
+   )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+# Generate the dictionary
+# It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument
+get_directory_property(incdirs INCLUDE_DIRECTORIES)
+generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS STEERBase STEER ESD CDB RAWDatabase RAWDatarec ADbase ADrec Core EG Geom Gpad Hist MathCore Net RIO Tree VMC)
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Add a library to the project using the specified source files
+add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+
+# Additional compilation flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Installation
+install(TARGETS ${MODULE}
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib)
+
+install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
diff --git a/AD/CMakelibADrec.pkg b/AD/CMakelibADrec.pkg
deleted file mode 100644 (file)
index c924c43..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for ADrec                                                         #
-# Author :                                        #
-# 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  
-    AliADReconstructor.cxx 
-    AliADTrigger.cxx 
-    AliADRecoParam.cxx
-    AliADRawStream.cxx 
-    AliADQADataMakerRec.cxx 
-#    AliADTriggerMask.cxx 
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR ADrecLinkDef.h)
-
-set ( EINCLUDE  STRUCT RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase)
diff --git a/AD/CMakelibADsim.pkg b/AD/CMakelibADsim.pkg
deleted file mode 100644 (file)
index fb5ad02..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for ADsim                                                         #
-# Author :                                        #
-# 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  
-    AliAD.cxx 
-    AliADv1.cxx 
-    AliADhit.cxx 
-    AliADDigitizer.cxx 
-    AliADBuffer.cxx 
-    AliADQADataMakerSim.cxx
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR ADsimLinkDef.h)
-
-set ( EINCLUDE  STRUCT RAW STEER/STEER STEER/STEERBase)