FMD module
authoragrigora <alina.grigoras@cern.ch>
Wed, 15 Oct 2014 15:15:18 +0000 (17:15 +0200)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:49 +0000 (13:51 +0100)
121 files changed:
CMakeLists.txt
FMD/CMakeLists.txt
FMD/CMakelibFMDbase.pkg [deleted file]
FMD/CMakelibFMDrec.pkg [deleted file]
FMD/CMakelibFMDsim.pkg [deleted file]
FMD/CMakelibFMDutil.pkg [deleted file]
FMD/FMDbase/AliFMD1.cxx [moved from FMD/AliFMD1.cxx with 100% similarity]
FMD/FMDbase/AliFMD1.h [moved from FMD/AliFMD1.h with 100% similarity]
FMD/FMDbase/AliFMD2.cxx [moved from FMD/AliFMD2.cxx with 100% similarity]
FMD/FMDbase/AliFMD2.h [moved from FMD/AliFMD2.h with 100% similarity]
FMD/FMDbase/AliFMD3.cxx [moved from FMD/AliFMD3.cxx with 100% similarity]
FMD/FMDbase/AliFMD3.h [moved from FMD/AliFMD3.h with 100% similarity]
FMD/FMDbase/AliFMDAltroMapping.cxx [moved from FMD/AliFMDAltroMapping.cxx with 100% similarity]
FMD/FMDbase/AliFMDAltroMapping.h [moved from FMD/AliFMDAltroMapping.h with 100% similarity]
FMD/FMDbase/AliFMDBaseDigit.cxx [moved from FMD/AliFMDBaseDigit.cxx with 100% similarity]
FMD/FMDbase/AliFMDBaseDigit.h [moved from FMD/AliFMDBaseDigit.h with 100% similarity]
FMD/FMDbase/AliFMDBoolMap.cxx [moved from FMD/AliFMDBoolMap.cxx with 100% similarity]
FMD/FMDbase/AliFMDBoolMap.h [moved from FMD/AliFMDBoolMap.h with 100% similarity]
FMD/FMDbase/AliFMDCalibFwd.h [moved from FMD/AliFMDCalibFwd.h with 100% similarity]
FMD/FMDbase/AliFMDCalibGain.cxx [moved from FMD/AliFMDCalibGain.cxx with 100% similarity]
FMD/FMDbase/AliFMDCalibGain.h [moved from FMD/AliFMDCalibGain.h with 100% similarity]
FMD/FMDbase/AliFMDCalibPedestal.cxx [moved from FMD/AliFMDCalibPedestal.cxx with 100% similarity]
FMD/FMDbase/AliFMDCalibPedestal.h [moved from FMD/AliFMDCalibPedestal.h with 100% similarity]
FMD/FMDbase/AliFMDCalibSampleRate.cxx [moved from FMD/AliFMDCalibSampleRate.cxx with 100% similarity]
FMD/FMDbase/AliFMDCalibSampleRate.h [moved from FMD/AliFMDCalibSampleRate.h with 100% similarity]
FMD/FMDbase/AliFMDCalibStripRange.cxx [moved from FMD/AliFMDCalibStripRange.cxx with 100% similarity]
FMD/FMDbase/AliFMDCalibStripRange.h [moved from FMD/AliFMDCalibStripRange.h with 100% similarity]
FMD/FMDbase/AliFMDDebug.h [moved from FMD/AliFMDDebug.h with 100% similarity]
FMD/FMDbase/AliFMDDetector.cxx [moved from FMD/AliFMDDetector.cxx with 100% similarity]
FMD/FMDbase/AliFMDDetector.h [moved from FMD/AliFMDDetector.h with 100% similarity]
FMD/FMDbase/AliFMDDigit.cxx [moved from FMD/AliFMDDigit.cxx with 100% similarity]
FMD/FMDbase/AliFMDDigit.h [moved from FMD/AliFMDDigit.h with 100% similarity]
FMD/FMDbase/AliFMDGeometry.cxx [moved from FMD/AliFMDGeometry.cxx with 100% similarity]
FMD/FMDbase/AliFMDGeometry.h [moved from FMD/AliFMDGeometry.h with 100% similarity]
FMD/FMDbase/AliFMDGeometryBuilder.cxx [moved from FMD/AliFMDGeometryBuilder.cxx with 100% similarity]
FMD/FMDbase/AliFMDGeometryBuilder.h [moved from FMD/AliFMDGeometryBuilder.h with 100% similarity]
FMD/FMDbase/AliFMDIndex.cxx [moved from FMD/AliFMDIndex.cxx with 100% similarity]
FMD/FMDbase/AliFMDIndex.h [moved from FMD/AliFMDIndex.h with 100% similarity]
FMD/FMDbase/AliFMDParameters.cxx [moved from FMD/AliFMDParameters.cxx with 100% similarity]
FMD/FMDbase/AliFMDParameters.h [moved from FMD/AliFMDParameters.h with 100% similarity]
FMD/FMDbase/AliFMDPreprocessor.cxx [moved from FMD/AliFMDPreprocessor.cxx with 100% similarity]
FMD/FMDbase/AliFMDPreprocessor.h [moved from FMD/AliFMDPreprocessor.h with 100% similarity]
FMD/FMDbase/AliFMDQAChecker.cxx [moved from FMD/AliFMDQAChecker.cxx with 100% similarity]
FMD/FMDbase/AliFMDQAChecker.h [moved from FMD/AliFMDQAChecker.h with 100% similarity]
FMD/FMDbase/AliFMDRing.cxx [moved from FMD/AliFMDRing.cxx with 100% similarity]
FMD/FMDbase/AliFMDRing.h [moved from FMD/AliFMDRing.h with 100% similarity]
FMD/FMDbase/AliFMDSDigit.cxx [moved from FMD/AliFMDSDigit.cxx with 100% similarity]
FMD/FMDbase/AliFMDSDigit.h [moved from FMD/AliFMDSDigit.h with 100% similarity]
FMD/FMDbase/AliFMDStripIndex.h [moved from FMD/AliFMDStripIndex.h with 100% similarity]
FMD/FMDbase/AliFMDSurveyToAlignObjs.cxx [moved from FMD/AliFMDSurveyToAlignObjs.cxx with 100% similarity]
FMD/FMDbase/AliFMDSurveyToAlignObjs.h [moved from FMD/AliFMDSurveyToAlignObjs.h with 100% similarity]
FMD/FMDbase/AliFMDUShortMap.cxx [moved from FMD/AliFMDUShortMap.cxx with 100% similarity]
FMD/FMDbase/AliFMDUShortMap.h [moved from FMD/AliFMDUShortMap.h with 100% similarity]
FMD/FMDbase/CMakeLists.txt [new file with mode: 0644]
FMD/FMDbase/FMDbaseLinkDef.h [moved from FMD/FMDbaseLinkDef.h with 100% similarity]
FMD/FMDrec/AliFMDESDRevertexer.cxx [moved from FMD/AliFMDESDRevertexer.cxx with 100% similarity]
FMD/FMDrec/AliFMDESDRevertexer.h [moved from FMD/AliFMDESDRevertexer.h with 100% similarity]
FMD/FMDrec/AliFMDEncodedEdx.h [moved from FMD/AliFMDEncodedEdx.h with 100% similarity]
FMD/FMDrec/AliFMDOfflineTrigger.cxx [moved from FMD/AliFMDOfflineTrigger.cxx with 100% similarity]
FMD/FMDrec/AliFMDOfflineTrigger.h [moved from FMD/AliFMDOfflineTrigger.h with 100% similarity]
FMD/FMDrec/AliFMDQADataMakerRec.cxx [moved from FMD/AliFMDQADataMakerRec.cxx with 100% similarity]
FMD/FMDrec/AliFMDQADataMakerRec.h [moved from FMD/AliFMDQADataMakerRec.h with 100% similarity]
FMD/FMDrec/AliFMDRawReader.cxx [moved from FMD/AliFMDRawReader.cxx with 100% similarity]
FMD/FMDrec/AliFMDRawReader.h [moved from FMD/AliFMDRawReader.h with 100% similarity]
FMD/FMDrec/AliFMDRawStream.cxx [moved from FMD/AliFMDRawStream.cxx with 100% similarity]
FMD/FMDrec/AliFMDRawStream.h [moved from FMD/AliFMDRawStream.h with 100% similarity]
FMD/FMDrec/AliFMDRecPoint.cxx [moved from FMD/AliFMDRecPoint.cxx with 100% similarity]
FMD/FMDrec/AliFMDRecPoint.h [moved from FMD/AliFMDRecPoint.h with 100% similarity]
FMD/FMDrec/AliFMDRecoParam.cxx [moved from FMD/AliFMDRecoParam.cxx with 100% similarity]
FMD/FMDrec/AliFMDRecoParam.h [moved from FMD/AliFMDRecoParam.h with 100% similarity]
FMD/FMDrec/AliFMDReconstructor.cxx [moved from FMD/AliFMDReconstructor.cxx with 100% similarity]
FMD/FMDrec/AliFMDReconstructor.h [moved from FMD/AliFMDReconstructor.h with 100% similarity]
FMD/FMDrec/CMakeLists.txt [new file with mode: 0644]
FMD/FMDrec/FMDrecLinkDef.h [moved from FMD/FMDrecLinkDef.h with 100% similarity]
FMD/FMDsim/AliFMD.cxx [moved from FMD/AliFMD.cxx with 100% similarity]
FMD/FMDsim/AliFMD.h [moved from FMD/AliFMD.h with 100% similarity]
FMD/FMDsim/AliFMDBaseDigitizer.cxx [moved from FMD/AliFMDBaseDigitizer.cxx with 100% similarity]
FMD/FMDsim/AliFMDBaseDigitizer.h [moved from FMD/AliFMDBaseDigitizer.h with 100% similarity]
FMD/FMDsim/AliFMDDigitizer.cxx [moved from FMD/AliFMDDigitizer.cxx with 100% similarity]
FMD/FMDsim/AliFMDDigitizer.h [moved from FMD/AliFMDDigitizer.h with 100% similarity]
FMD/FMDsim/AliFMDEdepHitPair.h [moved from FMD/AliFMDEdepHitPair.h with 100% similarity]
FMD/FMDsim/AliFMDEdepMap.cxx [moved from FMD/AliFMDEdepMap.cxx with 100% similarity]
FMD/FMDsim/AliFMDEdepMap.h [moved from FMD/AliFMDEdepMap.h with 100% similarity]
FMD/FMDsim/AliFMDHit.cxx [moved from FMD/AliFMDHit.cxx with 100% similarity]
FMD/FMDsim/AliFMDHit.h [moved from FMD/AliFMDHit.h with 100% similarity]
FMD/FMDsim/AliFMDHitDigitizer.cxx [moved from FMD/AliFMDHitDigitizer.cxx with 100% similarity]
FMD/FMDsim/AliFMDHitDigitizer.h [moved from FMD/AliFMDHitDigitizer.h with 100% similarity]
FMD/FMDsim/AliFMDQADataMakerSim.cxx [moved from FMD/AliFMDQADataMakerSim.cxx with 100% similarity]
FMD/FMDsim/AliFMDQADataMakerSim.h [moved from FMD/AliFMDQADataMakerSim.h with 100% similarity]
FMD/FMDsim/AliFMDRawWriter.cxx [moved from FMD/AliFMDRawWriter.cxx with 100% similarity]
FMD/FMDsim/AliFMDRawWriter.h [moved from FMD/AliFMDRawWriter.h with 100% similarity]
FMD/FMDsim/AliFMDv0.cxx [moved from FMD/AliFMDv0.cxx with 100% similarity]
FMD/FMDsim/AliFMDv0.h [moved from FMD/AliFMDv0.h with 100% similarity]
FMD/FMDsim/AliFMDv1.cxx [moved from FMD/AliFMDv1.cxx with 100% similarity]
FMD/FMDsim/AliFMDv1.h [moved from FMD/AliFMDv1.h with 100% similarity]
FMD/FMDsim/CMakeLists.txt [new file with mode: 0644]
FMD/FMDsim/FMDsimLinkDef.h [moved from FMD/FMDsimLinkDef.h with 100% similarity]
FMD/FMDutil/AliFMDAlignFaker.cxx [moved from FMD/AliFMDAlignFaker.cxx with 100% similarity]
FMD/FMDutil/AliFMDAlignFaker.h [moved from FMD/AliFMDAlignFaker.h with 100% similarity]
FMD/FMDutil/AliFMDBaseDA.cxx [moved from FMD/AliFMDBaseDA.cxx with 100% similarity]
FMD/FMDutil/AliFMDBaseDA.h [moved from FMD/AliFMDBaseDA.h with 100% similarity]
FMD/FMDutil/AliFMDCalibDrawer.cxx [moved from FMD/AliFMDCalibDrawer.cxx with 100% similarity]
FMD/FMDutil/AliFMDCalibDrawer.h [moved from FMD/AliFMDCalibDrawer.h with 100% similarity]
FMD/FMDutil/AliFMDCalibFaker.cxx [moved from FMD/AliFMDCalibFaker.cxx with 100% similarity]
FMD/FMDutil/AliFMDCalibFaker.h [moved from FMD/AliFMDCalibFaker.h with 100% similarity]
FMD/FMDutil/AliFMDDisplay.cxx [moved from FMD/AliFMDDisplay.cxx with 100% similarity]
FMD/FMDutil/AliFMDDisplay.h [moved from FMD/AliFMDDisplay.h with 100% similarity]
FMD/FMDutil/AliFMDFancy.cxx [moved from FMD/AliFMDFancy.cxx with 100% similarity]
FMD/FMDutil/AliFMDFancy.h [moved from FMD/AliFMDFancy.h with 100% similarity]
FMD/FMDutil/AliFMDGainDA.cxx [moved from FMD/AliFMDGainDA.cxx with 100% similarity]
FMD/FMDutil/AliFMDGainDA.h [moved from FMD/AliFMDGainDA.h with 100% similarity]
FMD/FMDutil/AliFMDInput.cxx [moved from FMD/AliFMDInput.cxx with 100% similarity]
FMD/FMDutil/AliFMDInput.h [moved from FMD/AliFMDInput.h with 100% similarity]
FMD/FMDutil/AliFMDPattern.cxx [moved from FMD/AliFMDPattern.cxx with 100% similarity]
FMD/FMDutil/AliFMDPattern.h [moved from FMD/AliFMDPattern.h with 100% similarity]
FMD/FMDutil/AliFMDPedestalDA.cxx [moved from FMD/AliFMDPedestalDA.cxx with 100% similarity]
FMD/FMDutil/AliFMDPedestalDA.h [moved from FMD/AliFMDPedestalDA.h with 100% similarity]
FMD/FMDutil/AliFMDSpectraDisplay.cxx [moved from FMD/AliFMDSpectraDisplay.cxx with 100% similarity]
FMD/FMDutil/AliFMDSpectraDisplay.h [moved from FMD/AliFMDSpectraDisplay.h with 100% similarity]
FMD/FMDutil/CMakeLists.txt [new file with mode: 0644]
FMD/FMDutil/FMDutilLinkDef.h [moved from FMD/FMDutilLinkDef.h with 100% similarity]

index 0f5d1f7..df5fd4f 100644 (file)
@@ -86,7 +86,7 @@ add_subdirectory (STRUCT)
 add_subdirectory (HMPID)
 add_subdirectory (PMD)
 add_subdirectory (MUON)
-#add_subdirectory (FMD)
+add_subdirectory (FMD)
 #add_subdirectory (ACORDE)
 #add_subdirectory (EMCAL)
 #add_subdirectory (PHOS)
index 85f3911..f521104 100644 (file)
@@ -1,10 +1,34 @@
-# AliRoot Build System CMakeLists for FMD
-#
-# 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)
+# PMD libraries
+add_subdirectory(FMDbase)
+add_subdirectory(FMDutil)
+add_subdirectory(FMDrec)
+add_subdirectory(FMDsim)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Install files to destination
+install(DIRECTORY scripts DESTINATION FMD)
+install(FILES 
+            Config.C
+            MakeFMDFullMisAlignment.C
+            MakeFMDResMisAlignment.C
+            MakeFMDZeroMisAlignment.C
+            Reconstruct.C
+            Simulate.C
+            ViewFMD.C
+        DESTINATION FMD)
 
-ALICE_BuildModule()
+message(STATUS "FMD enabled")
diff --git a/FMD/CMakelibFMDbase.pkg b/FMD/CMakelibFMDbase.pkg
deleted file mode 100644 (file)
index 4c8f272..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- mode: CMake -*-
-#----------------------------------------------------------------------------#
-# Package File for FMDbase                                                   #
-# 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   AliFMDIndex.cxx
-       AliFMDBaseDigit.cxx
-       AliFMDDigit.cxx
-       AliFMDSDigit.cxx
-       AliFMDBoolMap.cxx
-       AliFMDUShortMap.cxx
-       AliFMDCalibPedestal.cxx
-       AliFMDCalibGain.cxx
-       AliFMDCalibSampleRate.cxx
-       AliFMDCalibStripRange.cxx
-       AliFMDAltroMapping.cxx
-       AliFMDParameters.cxx
-       AliFMDGeometry.cxx
-       AliFMDRing.cxx
-       AliFMDDetector.cxx
-       AliFMD1.cxx
-       AliFMD2.cxx
-       AliFMD3.cxx
-       AliFMDPreprocessor.cxx
-       AliFMDQAChecker.cxx
-       AliFMDGeometryBuilder.cxx
-       AliFMDSurveyToAlignObjs.cxx)
-
-string (REPLACE ".cxx" ".h" HDRS  "${SRCS}")
-set ( HDRS ${HDRS} AliFMDCalibFwd.h )
-set ( DHDR  FMDbaseLinkDef.h)
-
-set ( EINCLUDE   RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase)
-
-set ( EXPORT 
-       AliFMDBaseDigit.h
-       AliFMDDigit.h
-       AliFMDCalibFwd.h
-       AliFMDParameters.h
-       AliFMDGeometry.h
-       AliFMDRing.h
-       AliFMDDetector.h 
-       AliFMDBoolMap.h 
-       AliFMDUShortMap.h )
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-  set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEER -lCDB -lESD -lSTEERBase -lRAWDatabase -L${ROOTLIBDIR} -lGeom)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
-
-# --------------------------------------------------------------------
-# Extra stuff 
-# 
-# Install OCDB data 
-install (
-  DIRECTORY ../OCDB/FMD 
-  DESTINATION OCDB
-  PATTERN ".svn" EXCLUDE)
-
-
-install (DIRECTORY scripts 
-        DESTINATION FMD
-        PATTERN ".svn" EXCLUDE 
-         PATTERN ".d"   EXCLUDE 
-        PATTERN ".so"  EXCLUDE)
-
-install (FILES Config.C
-              MakeFMDFullMisAlignment.C
-              MakeFMDResMisAlignment.C
-              MakeFMDZeroMisAlignment.C
-              Reconstruct.C
-              Simulate.C
-              ViewFMD.C
-        DESTINATION FMD)
-
-#
-# EOF
-#
diff --git a/FMD/CMakelibFMDrec.pkg b/FMD/CMakelibFMDrec.pkg
deleted file mode 100644 (file)
index dfe3d50..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- mode: CMake -*- 
-#------------------------------------------------------------------------#
-# Package File for FMDrec                                                #
-# 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   
-  AliFMDReconstructor.cxx 
-  AliFMDRecoParam.cxx 
-  AliFMDRawStream.cxx 
-  AliFMDRawReader.cxx 
-  AliFMDRecPoint.cxx 
-  AliFMDQADataMakerRec.cxx 
-  AliFMDOfflineTrigger.cxx 
-  AliFMDESDRevertexer.cxx)
-
-string (REPLACE ".cxx" ".h" HDRS "${SRCS}")
-set ( DHDR  FMDrecLinkDef.h)
-set ( EINCLUDE  RAW STEER/STEER STEER/ESD STEER/STEERBase)
-set ( EXPORT AliFMDRawReader.h )
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-  set ( PACKSOFLAGS  
-    ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} 
-    -lFMDbase -lSTEER -lESD -lSTEERBase -lRAWDatarec)
-endif( ALICE_TARGET STREQUAL "win32gcc")
-#
-# EOF
-#
diff --git a/FMD/CMakelibFMDsim.pkg b/FMD/CMakelibFMDsim.pkg
deleted file mode 100644 (file)
index bdae374..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- mode: CMake -*- 
-#------------------------------------------------------------------------#
-# Package File for FMDsim                                                #
-# 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   
-  AliFMD.cxx 
-  AliFMDv0.cxx 
-  AliFMDv1.cxx 
-  AliFMDHit.cxx
-  AliFMDBaseDigitizer.cxx
-  AliFMDDigitizer.cxx
-  AliFMDHitDigitizer.cxx
-  AliFMDEdepMap.cxx
-  AliFMDRawWriter.cxx
-  AliFMDQADataMakerSim.cxx)
-
-string (REPLACE ".cxx" ".h" HDRS "${SRCS}")
-set ( HDRS ${HDRS} AliFMDEdepHitPair.h )
-set ( DHDR  FMDsimLinkDef.h)
-set ( EINCLUDE  RAW STEER/STEER STEER/ESD STEER/STEERBase)
-set ( EXPORT AliFMDHit.h )
-#
-# EOF
-#
diff --git a/FMD/CMakelibFMDutil.pkg b/FMD/CMakelibFMDutil.pkg
deleted file mode 100644 (file)
index 41854d8..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- mode: CMake -*- 
-#------------------------------------------------------------------------#
-# Package File for FMDutil                                               #
-# 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   
-  AliFMDInput.cxx
-  AliFMDDisplay.cxx
-  AliFMDPattern.cxx
-  AliFMDFancy.cxx
-  AliFMDCalibFaker.cxx
-  AliFMDAlignFaker.cxx
-  AliFMDBaseDA.cxx
-  AliFMDPedestalDA.cxx
-  AliFMDGainDA.cxx
-  AliFMDSpectraDisplay.cxx
-  AliFMDCalibDrawer.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}")
-set ( DHDR  FMDutilLinkDef.h)
-set ( EINCLUDE  RAW STEER/ESD)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-  set ( PACKSOFLAGS  
-    ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lFMDrec -lFMDbase 
-    -lSTEER -lCDB -lESD -lSTEERBase -lRAWDatarec -L${ROOTLIBDIR} -lGeom)
-endif( ALICE_TARGET STREQUAL "win32gcc")
-
-#PH install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FMDGainda ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FMDPedestalda ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FMDBaseda
-#PH  DESTINATION bin/tgt_${ALICE_TARGET})
-
-#
-# EOF
-#
similarity index 100%
rename from FMD/AliFMD1.cxx
rename to FMD/FMDbase/AliFMD1.cxx
similarity index 100%
rename from FMD/AliFMD1.h
rename to FMD/FMDbase/AliFMD1.h
similarity index 100%
rename from FMD/AliFMD2.cxx
rename to FMD/FMDbase/AliFMD2.cxx
similarity index 100%
rename from FMD/AliFMD2.h
rename to FMD/FMDbase/AliFMD2.h
similarity index 100%
rename from FMD/AliFMD3.cxx
rename to FMD/FMDbase/AliFMD3.cxx
similarity index 100%
rename from FMD/AliFMD3.h
rename to FMD/FMDbase/AliFMD3.h
similarity index 100%
rename from FMD/AliFMDDebug.h
rename to FMD/FMDbase/AliFMDDebug.h
similarity index 100%
rename from FMD/AliFMDDigit.h
rename to FMD/FMDbase/AliFMDDigit.h
similarity index 100%
rename from FMD/AliFMDIndex.h
rename to FMD/FMDbase/AliFMDIndex.h
similarity index 100%
rename from FMD/AliFMDRing.h
rename to FMD/FMDbase/AliFMDRing.h
diff --git a/FMD/FMDbase/CMakeLists.txt b/FMD/FMDbase/CMakeLists.txt
new file mode 100644 (file)
index 0000000..45dd281
--- /dev/null
@@ -0,0 +1,89 @@
+# **************************************************************************
+# * 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 FMDbase)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/FMD/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/FMD/FMDrec
+                    ${CMAKE_SOURCE_DIR}/RAW/RAWDatabase
+                    ${CMAKE_SOURCE_DIR}/STEER/CDB
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliFMD1.cxx
+    AliFMD2.cxx
+    AliFMD3.cxx
+    AliFMDAltroMapping.cxx
+    AliFMDBaseDigit.cxx
+    AliFMDBoolMap.cxx
+    AliFMDCalibGain.cxx
+    AliFMDCalibPedestal.cxx
+    AliFMDCalibSampleRate.cxx
+    AliFMDCalibStripRange.cxx
+    AliFMDDetector.cxx
+    AliFMDDigit.cxx
+    AliFMDGeometryBuilder.cxx
+    AliFMDGeometry.cxx
+    AliFMDIndex.cxx
+    AliFMDParameters.cxx
+    AliFMDPreprocessor.cxx
+    AliFMDQAChecker.cxx
+    AliFMDRing.cxx
+    AliFMDSDigit.cxx
+    AliFMDSurveyToAlignObjs.cxx
+    AliFMDUShortMap.cxx
+   )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+set(HDRS ${HDRS} AliFMDCalibFwd.h)
+
+# 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 FMDrec)
+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/FMD/FMDrec/CMakeLists.txt b/FMD/FMDrec/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6081df9
--- /dev/null
@@ -0,0 +1,73 @@
+# **************************************************************************
+# * 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 FMDrec)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/FMD/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/FMD/FMDbase
+                    ${CMAKE_SOURCE_DIR}/RAW/RAWDatabase
+                    ${CMAKE_SOURCE_DIR}/RAW/RAWDatarec
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliFMDESDRevertexer.cxx
+    AliFMDOfflineTrigger.cxx
+    AliFMDQADataMakerRec.cxx
+    AliFMDRawReader.cxx
+    AliFMDRawStream.cxx
+    AliFMDReconstructor.cxx
+    AliFMDRecoParam.cxx
+    AliFMDRecPoint.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)
+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 FMD/AliFMD.cxx
rename to FMD/FMDsim/AliFMD.cxx
similarity index 100%
rename from FMD/AliFMD.h
rename to FMD/FMDsim/AliFMD.h
similarity index 100%
rename from FMD/AliFMDHit.cxx
rename to FMD/FMDsim/AliFMDHit.cxx
similarity index 100%
rename from FMD/AliFMDHit.h
rename to FMD/FMDsim/AliFMDHit.h
similarity index 100%
rename from FMD/AliFMDv0.cxx
rename to FMD/FMDsim/AliFMDv0.cxx
similarity index 100%
rename from FMD/AliFMDv0.h
rename to FMD/FMDsim/AliFMDv0.h
similarity index 100%
rename from FMD/AliFMDv1.cxx
rename to FMD/FMDsim/AliFMDv1.cxx
similarity index 100%
rename from FMD/AliFMDv1.h
rename to FMD/FMDsim/AliFMDv1.h
diff --git a/FMD/FMDsim/CMakeLists.txt b/FMD/FMDsim/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f8eb112
--- /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 FMDsim)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/FMD/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/FMD/FMDbase
+                    ${CMAKE_SOURCE_DIR}/FMD/FMDrec
+                    ${CMAKE_SOURCE_DIR}/RAW/RAWDatabase
+                    ${CMAKE_SOURCE_DIR}/RAW/RAWDatasim
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliFMDBaseDigitizer.cxx
+    AliFMD.cxx
+    AliFMDDigitizer.cxx
+    AliFMDEdepMap.cxx
+    AliFMDHit.cxx
+    AliFMDHitDigitizer.cxx
+    AliFMDQADataMakerSim.cxx
+    AliFMDRawWriter.cxx
+    AliFMDv0.cxx
+    AliFMDv1.cxx
+   )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+set(HDRS ${HDRS} AliFMDEdepHitPair.h)
+
+# 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 RAWDatasim FMDbase FMDrec)
+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 FMD/AliFMDFancy.h
rename to FMD/FMDutil/AliFMDFancy.h
similarity index 100%
rename from FMD/AliFMDInput.h
rename to FMD/FMDutil/AliFMDInput.h
diff --git a/FMD/FMDutil/CMakeLists.txt b/FMD/FMDutil/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8d0a477
--- /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 FMDutil)
+
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/FMD/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/FMD/FMDbase
+                    ${CMAKE_SOURCE_DIR}/FMD/FMDrec
+                    ${CMAKE_SOURCE_DIR}/FMD/FMDsim
+                    ${CMAKE_SOURCE_DIR}/RAW/RAWDatabase
+                    ${CMAKE_SOURCE_DIR}/RAW/RAWDatarec
+                    ${CMAKE_SOURCE_DIR}/STEER/CDB
+                    ${CMAKE_SOURCE_DIR}/STEER/ESD
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliFMDAlignFaker.cxx
+    AliFMDBaseDA.cxx
+    AliFMDCalibDrawer.cxx
+    AliFMDCalibFaker.cxx
+    AliFMDDisplay.cxx
+    AliFMDFancy.cxx
+    AliFMDGainDA.cxx
+    AliFMDInput.cxx
+    AliFMDPattern.cxx
+    AliFMDPedestalDA.cxx
+    AliFMDSpectraDisplay.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 RAWDatarec RAWDatabase FMDbase FMDrec FMDsim Graf Gui)
+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