PWGCFfemtoscopyUser converted to native cmake

diff --git a/PWGCF/CMakelibPWGCFfemtoscopyUser.pkg b/PWGCF/CMakelibPWGCFfemtoscopyUser.pkg
deleted file mode 100644 (file)
index b98dd7c..0000000
--- a/PWGCF/CMakelibPWGCFfemtoscopyUser.pkg
+++ /dev/null
@@ -1,41 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for PWGCFfemtoscopyUser                                            #
-# 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  FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityKTPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoMJTrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoKKTrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoTPCInnerCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoChi2CorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnSource.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelBPLCMSCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelBPLCMSCorrFctnKK.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnTrueQ.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnNonIdDR.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DLCMSSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelAllHiddenInfo.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCchiNdof.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQAEventCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCncls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDG.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnTPCNcls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhiCorrections.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnGammaMonitor.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQinvCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctn3DSphericalEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoBPLCMS3DCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutAntiGamma.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistance.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutPt.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoAvgSepCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDGV0.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoAnalysisAzimuthalPbPb.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistanceLM.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPicoEventRP.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistanceKK.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutResonances.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnMinvMonitor.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnPairFractions.cxx FEMTOSCOPY/AliFemtoUser/AliAnalysisTaskParticleEfficiency.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWGCFfemtoscopyUserLinkDef.h)
-
-set ( EXPORT )
-
-set ( EINCLUDE  PWGCF/FEMTOSCOPYAOD PWGCF/FEMTOSCOPY/AliFemto PWGCF/FEMTOSCOPY/AliFemtoUser ANALYSIS STEER/AOD STEER/STEERBase)
-if( ALICE_TARGET STREQUAL "win32gcc")
-
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lPWGCFAOD -lPWGCFfemtoscopy)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")

diff --git a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhiCorrections.h b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhiCorrections.h
index 221a020acad7e6ab42c948dbc2f511a80d50baf0..050fa366a7a76021ba42ef23aee088382dfa6ffa 100644 (file)
--- a/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhiCorrections.h
+++ b/PWGCF/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhiCorrections.h
@@ -44,7 +44,7 @@ public:
   double CalculateCorrectionWeight(double pT1, double pT2, double eta1, double eta2, double phi1, double phi2, double zvert1, double zvert2);
   void LoadCorrectionTabFromROOTFile1D(const char *file, ParticleType partType1, ParticleType partType2);
   void LoadCorrectionTabFromROOTFile(const char *file, ParticleType partType1, ParticleType partType2, bool doPtCorr, bool doEtaCorr, bool doPhiCorr, bool doZVertCorr);
-  void LoadCorrectionTabFromFile(const char *pTtab, const char *corrTab);
+  //  void LoadCorrectionTabFromFile(const char *pTtab, const char *corrTab); // Not implemented
   void SetCorrectionTab(ParticleType partType);
   
   void WriteHistos();

diff --git a/PWGCF/FEMTOSCOPY/AliFemtoUser/CMakeLists.txt b/PWGCF/FEMTOSCOPY/AliFemtoUser/CMakeLists.txt
new file mode 100644 (file)
index 0000000..09b0bc9
--- /dev/null
+++ b/PWGCF/FEMTOSCOPY/AliFemtoUser/CMakeLists.txt
@@ -0,0 +1,118 @@
+# **************************************************************************
+# * 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 PWGCFfemtoscopyUser)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGCF/FEMTOSCOPY/AliFemtoUser)
+
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/PWGCF/FEMTOSCOPY/AliFemto
+                    ${AliRoot_SOURCE_DIR}/STEER/AOD
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+  )
+
+# Sources - alphabetical order
+set(SRCS
+  AliFemtoShareQualityPairCut.cxx
+  AliFemtoShareQualityKTPairCut.cxx
+  AliFemtoShareQualityTPCEntranceSepPairCut.cxx
+  AliFemtoESDTrackCut.cxx
+  AliFemtoMJTrackCut.cxx
+  AliFemtoKKTrackCut.cxx
+  AliFemtoTPCInnerCorrFctn.cxx
+  AliFemtoChi2CorrFctn.cxx
+  AliFemtoModelCorrFctnSource.cxx
+  AliFemtoModelCorrFctnDEtaDPhi.cxx
+  AliFemtoModelBPLCMSCorrFctn.cxx
+  AliFemtoModelBPLCMSCorrFctnKK.cxx
+  AliFemtoModelGausRinvFreezeOutGenerator.cxx
+  AliFemtoModelCorrFctnTrueQ.cxx
+  AliFemtoModelCorrFctnNonIdDR.cxx
+  AliFemtoModelCorrFctn3DSpherical.cxx
+  AliFemtoModelCorrFctn3DLCMSSpherical.cxx
+  AliFemtoCutMonitorParticleMomRes.cxx
+  AliFemtoModelAllHiddenInfo.cxx
+  AliFemtoCutMonitorTrackTPCchiNdof.cxx
+  AliFemtoQATrackCut.cxx
+  AliFemtoQAEventCut.cxx
+  AliFemtoCutMonitorTrackTPCncls.cxx
+  AliFemtoShareQualityTPCEntranceSepQAPairCut.cxx
+  AliFemtoShareQualityQAPairCut.cxx
+  AliFemtoShareQualityCorrFctn.cxx
+  AliFemtoYlm.cxx
+  AliFemtoCorrFctnDirectYlm.cxx
+  AliFemtoModelCorrFctnDirectYlm.cxx
+  AliFemtoCutMonitorParticlePtPDG.cxx
+  AliFemtoCorrFctnTPCNcls.cxx
+  AliFemtoCorrFctnDEtaDPhi.cxx
+  AliFemtoCorrFctnDEtaDPhiCorrections.cxx
+  AliFemtoCorrFctnGammaMonitor.cxx
+  AliFemtoQinvCorrFctnEMCIC.cxx
+  AliFemtoCorrFctn3DSphericalEMCIC.cxx
+  AliFemtoBPLCMS3DCorrFctnEMCIC.cxx
+  AliFemtoPairCutAntiGamma.cxx
+  AliFemtoCutMonitorParticleEtCorr.cxx
+  AliFemtoPairCutRadialDistance.cxx
+  AliFemtoPairCutPt.cxx
+  AliFemtoAvgSepCorrFctn.cxx
+  AliFemtoCutMonitorParticlePtPDGV0.cxx
+  AliFemtoAnalysisAzimuthalPbPb.cxx
+  AliFemtoPairCutRadialDistanceLM.cxx
+  AliFemtoPicoEventRP.cxx
+  AliFemtoPairCutRadialDistanceKK.cxx
+  AliFemtoPairCutResonances.cxx
+  AliFemtoCorrFctnMinvMonitor.cxx
+  AliFemtoCorrFctnPairFractions.cxx
+  AliAnalysisTaskParticleEfficiency.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}")
+
+# Add a shared library
+add_library(${MODULE} SHARED  ${SRCS} G__${MODULE}.cxx)
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS ANALYSISalice PWGCFfemtoscopy)
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Linking the library
+target_link_libraries(${MODULE} ${LIBDEPS})
+
+# Public include folders that will be propagated to the dependecies
+target_include_directories(${MODULE} PUBLIC ${incdirs})
+
+# 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)

diff --git a/PWGCF/PWGCFfemtoscopyUserLinkDef.h b/PWGCF/FEMTOSCOPY/AliFemtoUser/PWGCFfemtoscopyUserLinkDef.h
similarity index 100%
rename from PWGCF/PWGCFfemtoscopyUserLinkDef.h
rename to PWGCF/FEMTOSCOPY/AliFemtoUser/PWGCFfemtoscopyUserLinkDef.h

diff --git a/PWGCF/FEMTOSCOPY/CMakeLists.txt b/PWGCF/FEMTOSCOPY/CMakeLists.txt
index 35e5b180f61c81348686f939eecee210ccb700a4..b7bbe7605ddb4b76796c51d7fddde995af2cbaa3 100644 (file)
--- a/PWGCF/FEMTOSCOPY/CMakeLists.txt
+++ b/PWGCF/FEMTOSCOPY/CMakeLists.txt
@@ -15,7 +15,7 @@
 
 # Include the libraries
 add_subdirectory(AliFemto)
-# add_subdirectory(AliFemtoUser)
+add_subdirectory(AliFemtoUser)
 
 install (DIRECTORY macros
          DESTINATION PWGCF/FEMTOSCOPY