PWGCF/Correlations converted to native cmake
authorhristov <Peter.Hristov@cern.ch>
Sat, 6 Dec 2014 18:40:22 +0000 (19:40 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:52:08 +0000 (13:52 +0100)
17 files changed:
PWGCF/CMakeLists.txt
PWGCF/CMakelibPWGCFCorrelationsBase.pkg [deleted file]
PWGCF/CMakelibPWGCFCorrelationsDPhi.pkg [deleted file]
PWGCF/CMakelibPWGCFCorrelationsJCORRAN.pkg [deleted file]
PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.h
PWGCF/Correlations/Base/CMakeLists.txt [new file with mode: 0644]
PWGCF/Correlations/Base/PWGCFCorrelationsBaseLinkDef.h [moved from PWGCF/PWGCFCorrelationsBaseLinkDef.h with 100% similarity]
PWGCF/Correlations/CMakeLists.txt [new file with mode: 0644]
PWGCF/Correlations/DPhi/CMakeLists.txt [new file with mode: 0644]
PWGCF/Correlations/DPhi/FourierDecomposition/AliDhcTask.h
PWGCF/Correlations/DPhi/PWGCFCorrelationsDPhiLinkDef.h [moved from PWGCF/PWGCFCorrelationsDPhiLinkDef.h with 100% similarity]
PWGCF/Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.cxx
PWGCF/Correlations/JCORRAN/AliJFilter.h
PWGCF/Correlations/JCORRAN/AliJHistManager.cxx
PWGCF/Correlations/JCORRAN/AliJHistManager.h
PWGCF/Correlations/JCORRAN/CMakeLists.txt [new file with mode: 0644]
PWGCF/Correlations/JCORRAN/PWGCFCorrelationsJCORRANLinkDef.h [moved from PWGCF/PWGCFCorrelationsJCORRANLinkDef.h with 100% similarity]

index 1bd288f..1f2e3e3 100644 (file)
@@ -14,6 +14,7 @@
 # **************************************************************************
 
 # Include the libraries
+add_subdirectory(Correlations)
 add_subdirectory(EBYE)
 add_subdirectory(FLOW)
 
diff --git a/PWGCF/CMakelibPWGCFCorrelationsBase.pkg b/PWGCF/CMakelibPWGCFCorrelationsBase.pkg
deleted file mode 100644 (file)
index 4ea747d..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWG4Correlations                                              #
-# 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  
-    Correlations/Base/AliUEHistograms.cxx
-    Correlations/Base/AliUEHist.cxx
-    Correlations/Base/AliAnalyseLeadingTrackUE.cxx
-    Correlations/Base/AliCFParticle.cxx
-    Correlations/Base/AliAnalysisTaskCFTree.cxx
-    Correlations/Base/AliTwoPlusOneContainer.cxx
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWGCFCorrelationsBaseLinkDef.h)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE ANALYSIS CORRFW PWGCF/Correlations/Base PWG/Tools STEER/AOD STEER/ESD STEER/STEERBase)
diff --git a/PWGCF/CMakelibPWGCFCorrelationsDPhi.pkg b/PWGCF/CMakelibPWGCFCorrelationsDPhi.pkg
deleted file mode 100644 (file)
index a592a98..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWG4Correlations                                              #
-# 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  
-    Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx
-    Correlations/DPhi/AliDptDptInMC.cxx
-    Correlations/DPhi/AliAnalysisTaskpxpx.cxx
-    Correlations/DPhi/AliAnalysisTaskpxpy.cxx
-    Correlations/DPhi/AliAnalysisTaskpypy.cxx
-    Correlations/DPhi/AliAnalysisTaskpzpz.cxx
-    Correlations/DPhi/AliAnalysisTask3PCorrelations.cxx 
-    Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx 
-    Correlations/DPhi/AliAnalysisTaskTwoPlusOne.cxx 
-    Correlations/DPhi/AliPhiCorrelationsQATask.cxx 
-    Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx 
-    Correlations/DPhi/AliAnalysisTaskMinijet.cxx
-    Correlations/DPhi/AliAnalysisTaskDiHadron.cxx
-    Correlations/DPhi/DiHadronPID/AliFunctionsDiHadronPID.cxx
-    Correlations/DPhi/DiHadronPID/AliTrackDiHadronPID.cxx
-    Correlations/DPhi/DiHadronPID/AliAODTrackCutsDiHadronPID.cxx
-    Correlations/DPhi/DiHadronPID/AliAODEventCutsDiHadronPID.cxx
-    Correlations/DPhi/DiHadronPID/AliHistToolsDiHadronPID.cxx
-    Correlations/DPhi/DiHadronPID/AliAnalysisTaskDiHadronPID.cxx 
-    Correlations/DPhi/DiHadronPID/AliAnalysisTaskCompareAODTrackCuts.cxx
-    Correlations/DPhi/AliAnalysisTaskDptDptQA.cxx
-    Correlations/DPhi/FourierDecomposition/AliPool.cxx
-    Correlations/DPhi/FourierDecomposition/AliDhcTask.cxx
-    Correlations/DPhi/FourierDecomposition/AliMuonEffMC.cxx
-    Correlations/DPhi/FourierDecomposition/AliMCTruthTrackMaker.cxx
-    Correlations/DPhi/FourierDecomposition/AliMCTruthCent.cxx
-    Correlations/DPhi/AliLeadingV0Correlation.cxx 
-    Correlations/DPhi/AliAnalysisTaskLongRangeCorrelations.cxx 
-    Correlations/DPhi/MuonHadron/AliAnalysisTaskMuonHadronCorrelations.cxx 
-    Correlations/DPhi/MuonHadron/AliAnalysisTaskDiMuonCorrelations.cxx
-    Correlations/DPhi/AliAnalysisTaskContMC.cxx
-    Correlations/DPhi/TriggerPID/AliAnalysisTaskPIDCORR.cxx
-    Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.cxx
-    Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorrKine.cxx
-    Correlations/DPhi/PidPid/AliAnalysisTaskPidPidCorrelations.cxx
-    Correlations/DPhi/PhiEffMC/AliAnalysisTaskPhiEffMc.cxx
-    Correlations/DPhi/AliAnalysisTaskPythiaMpi.cxx
-    Correlations/DPhi/AliAnalysisTaskDiJetCorrelations.cxx
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWGCFCorrelationsDPhiLinkDef.h)
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE ANALYSIS ANALYSIS/ESDfilter CORRFW PWGCF/Correlations/Base PWGCF/Correlations/DPhi PWGCF/Correlations/DPhi/FourierDecomposition PWG/Tools STEER/AOD STEER/ESD STEER/STEERBase PYTHIA6 PYTHIA8 EVGEN PYTHIA8/pythia8175/include LHAPDF)
diff --git a/PWGCF/CMakelibPWGCFCorrelationsJCORRAN.pkg b/PWGCF/CMakelibPWGCFCorrelationsJCORRAN.pkg
deleted file mode 100644 (file)
index 2f648b7..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWG4Correlations/JCORRAN                                              #
-# 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  
-       Correlations/JCORRAN/AliJCORRAN.cxx
-       Correlations/JCORRAN/AliJTrackCounter.cxx
-       Correlations/JCORRAN/AliJCORRANTask.cxx
-       Correlations/JCORRAN/AliJEfficiencyTask.cxx
-       Correlations/JCORRAN/AliJDiHadronCorrTask.cxx
-       Correlations/JCORRAN/AliJFilter.cxx
-       Correlations/JCORRAN/AliJEfficiencyScanner.cxx
-       Correlations/JCORRAN/AliJBaseEventHeader.cxx
-       Correlations/JCORRAN/AliJBaseTrack.cxx
-       Correlations/JCORRAN/AliJEventHeader.cxx
-       Correlations/JCORRAN/AliJJet.cxx
-       Correlations/JCORRAN/AliJMCTrack.cxx
-       Correlations/JCORRAN/AliJPhoton.cxx
-       Correlations/JCORRAN/AliJPiZero.cxx
-       Correlations/JCORRAN/AliJRunHeader.cxx
-       Correlations/JCORRAN/AliJTrack.cxx
-       Correlations/JCORRAN/AliJHistManager.cxx
-       Correlations/JCORRAN/AliJCorrelations.cxx
-       Correlations/JCORRAN/AliJDataManager.cxx
-       Correlations/JCORRAN/AliJRunTable.cxx
-       Correlations/JCORRAN/AliJHistos.cxx
-       Correlations/JCORRAN/AliJEventPool.cxx
-       Correlations/JCORRAN/AliJEfficiency.cxx
-       Correlations/JCORRAN/AliJTrackCut.cxx
-       Correlations/JCORRAN/AliJBaseCard.cxx
-       Correlations/JCORRAN/AliJCard.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS} Correlations/JCORRAN/AliJConst.h" )
-
-set ( DHDR  PWGCFCorrelationsJCORRANLinkDef.h )
-
-string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-
-set ( EINCLUDE ANALYSIS CORRFW PWGCF/Correlations/JCORRAN PWG/Tools STEER/AOD STEER/ESD STEER/STEERBase EMCAL PHOS)
index 5979e14..0d17c82 100644 (file)
@@ -38,7 +38,6 @@ class AliAnalyseLeadingTrackUE : public TObject {
  public: 
 
   AliAnalyseLeadingTrackUE();                                                   //constructor
-  AliAnalyseLeadingTrackUE(const AliAnalyseLeadingTrackUE & g);                 //copy constructor
   AliAnalyseLeadingTrackUE & operator = (const AliAnalyseLeadingTrackUE & g);   //assignment operator
   virtual ~AliAnalyseLeadingTrackUE();                                          //virtual destructor
 
@@ -83,6 +82,7 @@ protected:
   Bool_t CheckTrack(AliVParticle * part);
 
 private:
+  AliAnalyseLeadingTrackUE(const AliAnalyseLeadingTrackUE & g);                 //copy constructor, not implemented
   Int_t          fDebug;             // debug flag
   Int_t          fFilterBit;         // track selection cuts
   UInt_t         fTrackStatus;       // if non-0, the bits set in this variable are required for each track
diff --git a/PWGCF/Correlations/Base/CMakeLists.txt b/PWGCF/Correlations/Base/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0075476
--- /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 PWGCFCorrelationsBase)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGCF/Correlations/Base)
+
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/CORRFW
+                    ${AliRoot_SOURCE_DIR}/PWG/Tools
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+  )
+
+# Sources - alphabetical order
+set(SRCS
+  AliUEHistograms.cxx
+  AliUEHist.cxx
+  AliAnalyseLeadingTrackUE.cxx
+  AliCFParticle.cxx
+  AliAnalysisTaskCFTree.cxx
+  AliTwoPlusOneContainer.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 PWGTools)
+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/Correlations/CMakeLists.txt b/PWGCF/Correlations/CMakeLists.txt
new file mode 100644 (file)
index 0000000..97f067d
--- /dev/null
@@ -0,0 +1,19 @@
+# **************************************************************************
+# * 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.                  *
+# **************************************************************************
+
+# Include the libraries
+add_subdirectory(Base)
+add_subdirectory(DPhi)
+add_subdirectory(JCORRAN)
diff --git a/PWGCF/Correlations/DPhi/CMakeLists.txt b/PWGCF/Correlations/DPhi/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f5d6b15
--- /dev/null
@@ -0,0 +1,119 @@
+# **************************************************************************
+# * 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 PWGCFCorrelationsDPhi)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGCF/Correlations/DPhi)
+
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ESDfilter
+                    ${AliRoot_SOURCE_DIR}/CORRFW
+                    ${AliRoot_SOURCE_DIR}/EVGEN
+                    ${AliRoot_SOURCE_DIR}/LHAPDF
+                    ${AliRoot_SOURCE_DIR}/PWG/muon
+                    ${AliRoot_SOURCE_DIR}/PWG/Tools
+                    ${AliRoot_SOURCE_DIR}/PWGCF/Correlations/Base
+                    ${AliRoot_SOURCE_DIR}/PWGLF/SPECTRA/PiKaPr/TestAOD
+                    ${AliRoot_SOURCE_DIR}/PYTHIA6/AliPythia6
+                    ${AliRoot_SOURCE_DIR}/PYTHIA8/AliPythia8
+                    ${AliRoot_SOURCE_DIR}/PYTHIA8/pythia8175/include
+                    ${AliRoot_SOURCE_DIR}/STEER/AOD
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+  )
+
+# Sources - alphabetical order
+set(SRCS
+    AliAnalysisTask3PCorrelations.cxx.
+    AliAnalysisTaskContMC.cxx
+    AliAnalysisTaskDiHadron.cxx
+    AliAnalysisTaskDiJetCorrelations.cxx
+    AliAnalysisTaskDptDptCorrelations.cxx
+    AliAnalysisTaskDptDptQA.cxx
+    AliAnalysisTaskLeadingTrackUE.cxx.
+    AliAnalysisTaskLongRangeCorrelations.cxx.
+    AliAnalysisTaskMinijet.cxx
+    AliAnalysisTaskPhiCorrelations.cxx.
+    AliAnalysisTaskpxpx.cxx
+    AliAnalysisTaskpxpy.cxx
+    AliAnalysisTaskpxpy.cxx
+    AliAnalysisTaskpypy.cxx
+    AliAnalysisTaskpypy.cxx
+    AliAnalysisTaskPythiaMpi.cxx
+    AliAnalysisTaskpzpz.cxx
+    AliAnalysisTaskpzpz.cxx
+    AliAnalysisTaskTwoPlusOne.cxx.
+    AliDptDptInMC.cxx
+    AliLeadingV0Correlation.cxx.
+    AliPhiCorrelationsQATask.cxx.
+    DiHadronPID/AliAnalysisTaskCompareAODTrackCuts.cxx
+    DiHadronPID/AliAnalysisTaskDiHadronPID.cxx.
+    DiHadronPID/AliAODEventCutsDiHadronPID.cxx
+    DiHadronPID/AliAODTrackCutsDiHadronPID.cxx
+    DiHadronPID/AliFunctionsDiHadronPID.cxx
+    DiHadronPID/AliHistToolsDiHadronPID.cxx
+    DiHadronPID/AliTrackDiHadronPID.cxx
+    FourierDecomposition/AliDhcTask.cxx
+    FourierDecomposition/AliMCTruthCent.cxx
+    FourierDecomposition/AliMCTruthTrackMaker.cxx
+    FourierDecomposition/AliMuonEffMC.cxx
+    FourierDecomposition/AliPool.cxx
+    MuonHadron/AliAnalysisTaskDiMuonCorrelations.cxx
+    MuonHadron/AliAnalysisTaskMuonHadronCorrelations.cxx.
+    PhiEffMC/AliAnalysisTaskPhiEffMc.cxx
+    PidPid/AliAnalysisTaskPidPidCorrelations.cxx
+    TriggerPID/AliAnalysisTaskPIDCORR.cxx
+    TriggerPID/AliTwoParticlePIDCorr.cxx
+    TriggerPID/AliTwoParticlePIDCorrKine.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 AliPythia8 ANALYSISalice CORRFW PWGmuon PWGCFCorrelationsBase PWGLFspectra)
+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)
index 41e1c05..f5b0dcb 100644 (file)
@@ -7,7 +7,7 @@
 
 #include "AliAnalysisTaskSE.h"
 #include "AliPool.h"
-#include "PWG/muon/AliMuonTrackCuts.h"
+#include "AliMuonTrackCuts.h"
 
 class TFormula;
 class TH1;
index 4ea17f1..7724c49 100644 (file)
@@ -41,8 +41,8 @@
 #include "AliPID.h"
 #include "AliVEvent.h"
 #include "AliPIDResponse.h"
-#include "PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODTrackCuts.h"
-#include "PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h"
+#include "AliSpectraAODTrackCuts.h"
+#include "AliSpectraAODEventCuts.h"
 #include "AliStack.h"
 #include <TMCProcess.h>
 #include "AliAnalyseLeadingTrackUE.h"
index de6f046..28bd520 100644 (file)
@@ -147,14 +147,14 @@ class AliJFilter : public TNamed  {
   void ReadESDTracks(AliESDEvent* esd);
   void ConvertESDTPCOnlyTracks(AliESDEvent* esd, int iTrack, AliJTrack * ctrack, double ptMin, double ptMax);
   void ConvertESDGCGTracks(AliESDEvent* esd, int iTrack, AliJTrack * ctrack, double ptMin, double ptMax);
-  void ReadESDCaloClusters(const AliESDEvent* esd);
-  void ReadESDCaloCells(const AliESDEvent* esd);
+  void ReadESDCaloClusters(const AliESDEvent* esd){;} // Not implemented
+  void ReadESDCaloCells(const AliESDEvent* esd){;} // Not implemented
   void ReadESDHeader(AliESDEvent* esd);
   void ReadESDPID(AliESDtrack* track, AliJTrack* ctrack);
   // methods to read data from AOD
   Bool_t ReadAODTracks(const AliAODEvent* aod);
-  Bool_t ReadAODCaloClusters(const AliAODEvent* aod);
-  void ReadAODCaloCells(const AliAODEvent* aod);
+  Bool_t ReadAODCaloClusters(const AliAODEvent* aod) {return kFALSE;} // Not implemented
+  void ReadAODCaloCells(const AliAODEvent* aod){;} // Not implemented
   void ReadAODHeader(AliAODEvent* aod);
   void ReadFilter();
   void ReadMCTracksFromESD();
index 3e30f89..35e9507 100644 (file)
@@ -622,20 +622,6 @@ bool AliJTH1::IsLoadMode(){
 }
 
 
-//////////////////////////////////////////////////////////////////////////
-//                                                                      //
-// AliJTH1Derived                                                       //
-//                                                                      //
-//////////////////////////////////////////////////////////////////////////
-template< typename T>
-AliJTH1Derived<T>::AliJTH1Derived():
-    AliJTH1(), fPlayer(this)
-{
-}
-template< typename T>
-AliJTH1Derived<T>::~AliJTH1Derived(){
-}
-
 
 
 
index 40448a9..6429164 100644 (file)
@@ -307,10 +307,15 @@ template< typename T >
 class AliJTH1Derived : public AliJTH1 {
     protected:
     public:
-        AliJTH1Derived();
+
+    AliJTH1Derived(): AliJTH1(), fPlayer(this) {}
+    virtual ~AliJTH1Derived(){}
+
+
+        /* AliJTH1Derived(); */
         AliJTH1Derived(TString config, AliJHistManager *hmg):
             AliJTH1(config, hmg),fPlayer(this){}
-        virtual ~AliJTH1Derived();
+        /* virtual ~AliJTH1Derived(); */
 
         //AliJTH1DerivedPlayer<T> & operator[](int i){ fPlayer.Init();return fPlayer[i]; }
    //     AliJTH1DerivedPlayer<T> & operator[](int i){ fPlayer.Init();fPlayer[i];return fPlayer; }
diff --git a/PWGCF/Correlations/JCORRAN/CMakeLists.txt b/PWGCF/Correlations/JCORRAN/CMakeLists.txt
new file mode 100644 (file)
index 0000000..080e777
--- /dev/null
@@ -0,0 +1,94 @@
+# **************************************************************************
+# * 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 PWGCFCorrelationsJCORRAN)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGCF/Correlations/JCORRAN)
+
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
+                    ${AliRoot_SOURCE_DIR}/PHOS/PHOSUtils
+                    ${AliRoot_SOURCE_DIR}/STEER/AOD
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+  )
+
+# Sources - alphabetical order
+set(SRCS
+  AliJCORRAN.cxx
+  AliJTrackCounter.cxx
+  AliJCORRANTask.cxx
+  AliJEfficiencyTask.cxx
+  AliJDiHadronCorrTask.cxx
+  AliJFilter.cxx
+  AliJEfficiencyScanner.cxx
+  AliJBaseEventHeader.cxx
+  AliJBaseTrack.cxx
+  AliJEventHeader.cxx
+  AliJJet.cxx
+  AliJMCTrack.cxx
+  AliJPhoton.cxx
+  AliJPiZero.cxx
+  AliJRunHeader.cxx
+  AliJTrack.cxx
+  AliJHistManager.cxx
+  AliJCorrelations.cxx
+  AliJDataManager.cxx
+  AliJRunTable.cxx
+  AliJHistos.cxx
+  AliJEventPool.cxx
+  AliJEfficiency.cxx
+  AliJTrackCut.cxx
+  AliJBaseCard.cxx
+  AliJCard.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 CORRFW EMCALUtils PHOSUtils)
+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)