FIT module
authoragrigora <alina.grigoras@cern.ch>
Fri, 14 Nov 2014 15:25:32 +0000 (16:25 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:55 +0000 (13:51 +0100)
33 files changed:
CMakeLists.txt
CMakelibFITsim.pkg [new file with mode: 0644]
FIT/CMakeLists.txt
FIT/CMakelibFITbase.pkg [deleted file]
FIT/CMakelibFITrec.pkg [deleted file]
FIT/CMakelibFITsim.pkg [deleted file]
FIT/FITbase/AliFIT.cxx [moved from FIT/AliFIT.cxx with 100% similarity]
FIT/FITbase/AliFIT.h [moved from FIT/AliFIT.h with 100% similarity]
FIT/FITbase/AliFITDigit.cxx [moved from FIT/AliFITDigit.cxx with 100% similarity]
FIT/FITbase/AliFITDigit.h [moved from FIT/AliFITDigit.h with 100% similarity]
FIT/FITbase/AliFITDigitizer.cxx [moved from FIT/AliFITDigitizer.cxx with 100% similarity]
FIT/FITbase/AliFITDigitizer.h [moved from FIT/AliFITDigitizer.h with 100% similarity]
FIT/FITbase/AliFITHits.cxx [moved from FIT/AliFITHits.cxx with 100% similarity]
FIT/FITbase/AliFITHits.h [moved from FIT/AliFITHits.h with 100% similarity]
FIT/FITbase/AliFITRawData.cxx [moved from FIT/AliFITRawData.cxx with 100% similarity]
FIT/FITbase/AliFITRawData.h [moved from FIT/AliFITRawData.h with 100% similarity]
FIT/FITbase/AliFITRawReader.cxx [moved from FIT/AliFITRawReader.cxx with 100% similarity]
FIT/FITbase/AliFITRawReader.h [moved from FIT/AliFITRawReader.h with 100% similarity]
FIT/FITbase/CMakeLists.txt [new file with mode: 0644]
FIT/FITbase/FITbaseLinkDef.h [moved from FIT/FITsimLinkDef.h with 80% similarity]
FIT/FITrec/AliFITRecPoint.cxx [moved from FIT/AliFITRecPoint.cxx with 100% similarity]
FIT/FITrec/AliFITRecPoint.h [moved from FIT/AliFITRecPoint.h with 100% similarity]
FIT/FITrec/AliFITReconstructor.cxx [moved from FIT/AliFITReconstructor.cxx with 100% similarity]
FIT/FITrec/AliFITReconstructor.h [moved from FIT/AliFITReconstructor.h with 100% similarity]
FIT/FITrec/CMakeLists.txt [new file with mode: 0644]
FIT/FITrec/FITrecLinkDef.h [moved from FIT/FITrecLinkDef.h with 90% similarity]
FIT/FITsim/AliFITv0.cxx [moved from FIT/AliFITv0.cxx with 100% similarity]
FIT/FITsim/AliFITv0.h [moved from FIT/AliFITv0.h with 100% similarity]
FIT/FITsim/AliFITv1.cxx [moved from FIT/AliFITv1.cxx with 100% similarity]
FIT/FITsim/AliFITv1.h [moved from FIT/AliFITv1.h with 100% similarity]
FIT/FITsim/CMakeLists.txt [new file with mode: 0644]
FIT/FITsim/FITsimLinkDef.h [moved from FIT/FITbaseLinkDef.h with 75% similarity]
ITS/UPGRADE/CMakelibITSUpgradeBase.pkg [deleted file]

index 432bcd7..b68866e 100644 (file)
@@ -86,57 +86,61 @@ message(STATUS "Source folder: ${AliRoot_SOURCE_DIR}")
 message(STATUS "Installation folder: ${CMAKE_INSTALL_PREFIX}")
 
 
-# AliRoot modules
+# AliRoot base modules
 add_subdirectory(STEER)
-add_subdirectory(STAT)
-add_subdirectory(OADB)
-add_subdirectory(ANALYSIS)
 add_subdirectory(RAW)
-add_subdirectory(JETAN)
+add_subdirectory(ANALYSIS)
+
+# Include Vc own cmake
+include(Vc/Vc.cmake)
+add_subdirectory(Vc)
+
+# AliRoot modules
+add_subdirectory(ACORDE)
+add_subdirectory(AD)
+add_subdirectory(BCM)
+add_subdirectory(CORRFW)
+add_subdirectory(EMCAL)
+add_subdirectory(EVE)
+add_subdirectory(EVGEN)
+add_subdirectory(FASTSIM)
+add_subdirectory(FIT)
+add_subdirectory(FMD)
+add_subdirectory(HLT)
+add_subdirectory(HMPID)
 add_subdirectory(ITS)
-add_subdirectory(TPC)
-add_subdirectory(VZERO)
+add_subdirectory(JETAN)
+add_subdirectory(MONITOR)
+add_subdirectory(MUON)
+add_subdirectory(OADB)
+add_subdirectory(PHOS)
+add_subdirectory(PMD)
+add_subdirectory(STARLIGHT)
+add_subdirectory(STAT)
+add_subdirectory(STRUCT)
 add_subdirectory(T0)
 add_subdirectory(TOF)
+add_subdirectory(TPC)
 add_subdirectory(TRD)
-add_subdirectory(ZDC)
-add_subdirectory(STRUCT)
-add_subdirectory(HMPID)
-add_subdirectory(PMD)
-add_subdirectory(MUON)
-add_subdirectory(FMD)
-add_subdirectory(ACORDE)
-add_subdirectory(EMCAL)
-add_subdirectory(PHOS)
 add_subdirectory(TRIGGER)
-add_subdirectory(BCM)
-add_subdirectory(CORRFW)
-add_subdirectory(FASTSIM)
+add_subdirectory(TTherminator)
+add_subdirectory(VZERO)
+add_subdirectory(ZDC)
 
+# Fortran modules
 if(CMAKE_Fortran_COMPILER)
+  add_subdirectory(HIJING)
   add_subdirectory(LHAPDF)
-  add_subdirectory(PYTHIA6)
   add_subdirectory(MICROCERN)
-  add_subdirectory(TUHKMgen)
-  add_subdirectory(THydjet)
-  add_subdirectory(TPHIC)
+  add_subdirectory(PYTHIA6)
   add_subdirectory(TEPEMGEN)
   add_subdirectory(THbtp)
   add_subdirectory(THijing)
-  add_subdirectory(HIJING)
+  add_subdirectory(THydjet)
+  add_subdirectory(TPHIC)
+  add_subdirectory(TUHKMgen)
 endif(CMAKE_Fortran_COMPILER)
 
-add_subdirectory(EVGEN)
-add_subdirectory(TTherminator)
-# Include Vc own cmake
-include(Vc/Vc.cmake)
-add_subdirectory(Vc)
-add_subdirectory(HLT)
-add_subdirectory(STARLIGHT)
-add_subdirectory(EVE)
-add_subdirectory(AD)
-add_subdirectory(MONITOR)
-
 # Enable SHUTTLE compilation
 # Check if DIMDIR and ODIR are set
 if(SHUTTLE)
diff --git a/CMakelibFITsim.pkg b/CMakelibFITsim.pkg
new file mode 100644 (file)
index 0000000..e69de29
index 369864a..d791ecf 100644 (file)
@@ -1,10 +1,20 @@
-# AliRoot Build System CMakeLists for T0
-#
-# 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(FITbase)
+add_subdirectory(FITrec)
+add_subdirectory(FITsim)
 
-file(GLOB PACKAGES CMake*.pkg)
-
-ALICE_BuildModule()
+message(STATUS "FIT enabled")
diff --git a/FIT/CMakelibFITbase.pkg b/FIT/CMakelibFITbase.pkg
deleted file mode 100644 (file)
index 162d2b5..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for T0base                                                        #
-# 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 
-    AliFIT.cxx 
-    AliFITDigit.cxx 
-)
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  FITbaseLinkDef.h)
-
-set ( EINCLUDE  RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase)
-
-set ( EXPORT AliFITDigit.h)
diff --git a/FIT/CMakelibFITrec.pkg b/FIT/CMakelibFITrec.pkg
deleted file mode 100644 (file)
index aac9b6a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for T0base                                                        #
-# 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 
-    AliFITReconstructor.cxx 
-    AliFITRawReader.cxx
-     )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  FITrecLinkDef.h)
-
-set ( EINCLUDE  RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase)
-
-set ( EXPORT AliFITDigit.h)
diff --git a/FIT/CMakelibFITsim.pkg b/FIT/CMakelibFITsim.pkg
deleted file mode 100644 (file)
index a90e4cf..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for T0base                                                        #
-# 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 
-    AliFITHits.cxx 
-    AliFITDigitizer.cxx 
-    AliFITv1.cxx
-    AliFITv0.cxx
-    AliFITv2.cxx
-    AliFITRawData.cxx
-     )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  FITsimLinkDef.h)
-
-set ( EINCLUDE  RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase)
-
-set ( EXPORT AliFITDigit.h)
similarity index 100%
rename from FIT/AliFIT.cxx
rename to FIT/FITbase/AliFIT.cxx
similarity index 100%
rename from FIT/AliFIT.h
rename to FIT/FITbase/AliFIT.h
similarity index 100%
rename from FIT/AliFITDigit.h
rename to FIT/FITbase/AliFITDigit.h
similarity index 100%
rename from FIT/AliFITHits.h
rename to FIT/FITbase/AliFITHits.h
diff --git a/FIT/FITbase/CMakeLists.txt b/FIT/FITbase/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1588926
--- /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 FITbase)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/FIT/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliFIT.cxx
+    AliFITDigit.cxx
+    AliFITDigitizer.cxx
+    AliFITHits.cxx
+    AliFITRawData.cxx
+    AliFITRawReader.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 STEER STEERBase ESD RAWDatabase RAWDatarec RAWDatasim  Core Hist MathCore 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)
+target_link_libraries(${MODULE} STEERBase STEER ESD RAWDatabase RAWDatarec RAWDatasim Core Hist MathCore RIO Tree)
+
+# Additional compilation flags
+set(MODULE_COMPILE_FLAGS "-O -g")
+set(MODULE_LINK_FLAGS)
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Target properties
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
+# Installation
+install(TARGETS ${MODULE}
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib)
+
+install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
similarity index 80%
rename from FIT/FITsimLinkDef.h
rename to FIT/FITbase/FITbaseLinkDef.h
index 579c3cf..d0693ff 100644 (file)
@@ -8,11 +8,11 @@
 #pragma link off all classes;
 #pragma link off all functions;
  
-#pragma link C++ class  AliFITHits+;
+#pragma link C++ class  AliFIT+;
+#pragma link C++ class  AliFITDigit+;
 #pragma link C++ class  AliFITDigitizer+;
-#pragma link C++ class  AliFITv1+;
-#pragma link C++ class  AliFITv0+;
-#pragma link C++ class  AliFITv2+;
+#pragma link C++ class  AliFITHits+;
 #pragma link C++ class  AliFITRawData+;
+#pragma link C++ class  AliFITRawReader+;
 
 #endif
diff --git a/FIT/FITrec/CMakeLists.txt b/FIT/FITrec/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7673116
--- /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 FITrec)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/FIT/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${AliRoot_SOURCE_DIR}/FIT/FITbase
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliFITReconstructor.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 RAWDatabase RAWDatarec FITbase Core)
+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} STEERBase STEER ESD RAWDatabase RAWDatarec FITbase Core)
+
+# Additional compilation flags
+set(MODULE_COMPILE_FLAGS "-O -g")
+set(MODULE_LINK_FLAGS)
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Target properties
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
+# Installation
+install(TARGETS ${MODULE}
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib)
+
+install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
similarity index 90%
rename from FIT/FITrecLinkDef.h
rename to FIT/FITrec/FITrecLinkDef.h
index f3f4aa9..16f231b 100644 (file)
@@ -9,5 +9,4 @@
 #pragma link off all functions;
  
 #pragma link C++ class  AliFITReconstructor+;
-#pragma link C++ class  AliFITRawReader+;
 #endif
similarity index 100%
rename from FIT/AliFITv0.cxx
rename to FIT/FITsim/AliFITv0.cxx
similarity index 100%
rename from FIT/AliFITv0.h
rename to FIT/FITsim/AliFITv0.h
similarity index 100%
rename from FIT/AliFITv1.cxx
rename to FIT/FITsim/AliFITv1.cxx
similarity index 100%
rename from FIT/AliFITv1.h
rename to FIT/FITsim/AliFITv1.h
diff --git a/FIT/FITsim/CMakeLists.txt b/FIT/FITsim/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a2c5539
--- /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 FITsim)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/FIT/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${AliRoot_SOURCE_DIR}/FIT/FITbase
+                    ${AliRoot_SOURCE_DIR}/STEER/CDB
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliFITv0.cxx
+    AliFITv1.cxx
+    AliFITv2.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 CDB FITbase Core Geom Physics 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)
+target_link_libraries(${MODULE} STEERBase STEER FITbase CDB Core Geom Physics VMC)
+
+# Additional compilation flags
+set(MODULE_COMPILE_FLAGS "-O -g")
+set(MODULE_LINK_FLAGS)
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Target properties
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
+# Installation
+install(TARGETS ${MODULE}
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib)
+
+install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file
similarity index 75%
rename from FIT/FITbaseLinkDef.h
rename to FIT/FITsim/FITsimLinkDef.h
index 76dc48c..f014e30 100644 (file)
@@ -7,8 +7,9 @@
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
-#pragma link C++ class  AliFIT+;
-#pragma link C++ class  AliFITDigit+;
+
+#pragma link C++ class  AliFITv2+;
+#pragma link C++ class  AliFITv1+;
+#pragma link C++ class  AliFITv0+;
 
 #endif
diff --git a/ITS/UPGRADE/CMakelibITSUpgradeBase.pkg b/ITS/UPGRADE/CMakelibITSUpgradeBase.pkg
deleted file mode 100644 (file)
index 310315c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for ITSbase                                                       #
-# 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 
-v0/AliITSDigitUpgrade.cxx 
-v0/AliITSsegmentationUpgrade.cxx 
-v0/AliITSRecPointU.cxx 
-#
-AliITSULoader.cxx 
-AliITSUGeomTGeo.cxx
-AliITSUCalibrationPix.cxx
-AliITSUSegmentationPix.cxx
-AliITSUSensMap.cxx
-AliITSUSDigit.cxx
-AliITSUAux.cxx
-AliITSUParamList.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR ITSUpgradeBaseLinkDef.h)
-
-set ( EINCLUDE ${GEANT3_ROOT}/TGeant3 TPC RAW ITS ITS/UPGRADE ITS/UPGRADE/v0 STEER/STEER STEER/ESD STEER/STEERBase )