PWGDQ
authoragrigora <alina.grigoras@cern.ch>
Thu, 4 Dec 2014 11:09:40 +0000 (12:09 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:52:06 +0000 (13:52 +0100)
14 files changed:
CMakeLists.txt
PWGDQ/CMakeLists.txt
PWGDQ/base/CMakeLists.txt [new file with mode: 0644]
PWGDQ/base/PWGDQbaseLinkDef.h [moved from PWGDQ/PWGDQbaseLinkDef.h with 100% similarity]
PWGDQ/dielectron/AliAnalysisTaskDielectronME.h
PWGDQ/dielectron/AliAnalysisTaskMultiDielectronTG.h
PWGDQ/dielectron/CMakeLists.txt [new file with mode: 0644]
PWGDQ/dielectron/PWGDQdielectronLinkDef.h [moved from PWGDQ/PWGDQdielectronLinkDef.h with 100% similarity]
PWGUD/CMakelibPWGUDFP.pkg [deleted file]
PWGUD/CMakelibPWGUDbase.pkg [deleted file]
PWGUD/CMakelibPWGUDdiffractive.pkg [deleted file]
PWGUD/CMakelibPWGUDselectors.pkg [deleted file]
PWGUD/CMakelibPWGUDupc.pkg [deleted file]
PWGUD/UPC/CMakeLists.txt

index 36fdd9b..0081e6e 100644 (file)
@@ -247,6 +247,7 @@ endif(CMAKE_Fortran_COMPILER)
 
 # PWG libraries
 add_subdirectory(PWG)
+add_subdirectory(PWGDQ)
 add_subdirectory(PWGUD)
 
 # Enable SHUTTLE compilation
index 30389a2..0e73130 100644 (file)
@@ -1,10 +1,19 @@
-# AliRoot Build System CMakeLists for PWGDQ
-#
-# 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(base)
+add_subdirectory(dielectron)
 
-file(GLOB PACKAGES CMake*.pkg)
-
-ALICE_BuildModule()
+message(STATUS "PWGDQ enabled")
diff --git a/PWGDQ/base/CMakeLists.txt b/PWGDQ/base/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2064fbf
--- /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 PWGDQbase)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGDQ/base)
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliQuarkoniaAcceptance.cxx
+    AliQuarkoniaEfficiency.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}")
+
+set(ROOT_DEPENDENCIES Core Hist RIO)
+set(ALIROOT_DEPENDENCIES STEERBase)
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES})
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Create an object to be reused in case of static libraries 
+# Otherwise the sources will be compiled twice
+add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx)
+# Add a library to the project using the object
+add_library(${MODULE} SHARED $<TARGET_OBJECTS:${MODULE}-object>)
+target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES})
+
+# Setting the correct headers for the object as gathered from the dependencies
+target_include_directories(${MODULE}-object PUBLIC $<TARGET_PROPERTY:${MODULE},INCLUDE_DIRECTORIES>)
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $<TARGET_PROPERTY:${MODULE},COMPILE_DEFINITIONS>)
+
+# Public include folders that will be propagated to the dependecies
+target_include_directories(${MODULE} PUBLIC ${incdirs})
+
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting compilation flags for the object
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+# Setting the linking flags for the library
+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
index 54c42ae..20471c5 100644 (file)
 #include "TList.h"
 
 #include "AliAnalysisTaskME.h"
-
+#include "AliDielectron.h"
 #include "AliDielectronPID.h"
 
-class AliDielectron;
+//class AliDielectron;
 class TH1D;
 
 class AliAnalysisTaskDielectronME : public AliAnalysisTaskME {
index fe5f6a3..950389e 100644 (file)
@@ -22,7 +22,7 @@
 #include <vector>
 #include <deque>
 #include <cstdlib>
-
+#include "AliDielectronVarManager.h"
 
 using std::vector;
 using std::deque;
diff --git a/PWGDQ/dielectron/CMakeLists.txt b/PWGDQ/dielectron/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b7b6895
--- /dev/null
@@ -0,0 +1,139 @@
+# **************************************************************************
+# * 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 PWGDQdielectron)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGDQ/dielectron)
+
+# Additional include folders in 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}/PWGCF/Correlations # what deps here?
+                    ${AliRoot_SOURCE_DIR}/PWG/FLOW/Base
+                    ${AliRoot_SOURCE_DIR}/PWG/FLOW/Tasks
+                    ${AliRoot_SOURCE_DIR}/PWGLF/FORWARD # what deps here
+                    ${AliRoot_SOURCE_DIR}/STEER/AOD
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                    ${AliRoot_SOURCE_DIR}/TRD/TRDbase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+      AliAnalysisTaskDielectronEfficiency.cxx
+      AliAnalysisTaskDielectronFilter.cxx
+      AliAnalysisTaskDielectronME.cxx
+      AliAnalysisTaskDielectronReadAODBranch.cxx
+      AliAnalysisTaskDielectronSE.cxx
+      AliAnalysisTaskMultiDielectron.cxx
+      AliAnalysisTaskMultiDielectronTG.cxx
+      AliAnalysisTaskReducedTree.cxx
+      AliAnalysisTaskSingleParticle.cxx
+      AliDielectronBtoJPSItoEleCDFfitFCN.cxx
+      AliDielectronBtoJPSItoEleCDFfitFCNfitter.cxx
+      AliDielectronBtoJPSItoEleCDFfitHandler.cxx
+      AliDielectronBtoJPSItoEle.cxx
+      AliDielectronCF.cxx
+      AliDielectronCFdraw.cxx
+      AliDielectronCutGroup.cxx
+      AliDielectronCutQA.cxx
+      AliDielectron.cxx
+      AliDielectronDebugTree.cxx
+      AliDielectronEventCuts.cxx
+      AliDielectronEvent.cxx
+      AliDielectronHelper.cxx
+      AliDielectronHF.cxx
+      AliDielectronHFhelper.cxx
+      AliDielectronHistos.cxx
+      AliDielectronMC.cxx
+      AliDielectronMixingHandler.cxx
+      AliDielectronPair.cxx
+      AliDielectronPairLegCuts.cxx
+      AliDielectronPID.cxx
+      AliDielectronSignalBase.cxx
+      AliDielectronSignalExt.cxx
+      AliDielectronSignalFunc.cxx
+      AliDielectronSignalMC.cxx
+      AliDielectronSpectrum.cxx
+      AliDielectronTrackCuts.cxx
+      AliDielectronTrackRotator.cxx
+      AliDielectronTRDpidCut.cxx
+      AliDielectronV0Cuts.cxx
+      AliDielectronVarCuts.cxx
+      AliDielectronVarManager.cxx
+      AliReducedEvent.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}")
+
+set(ROOT_DEPENDENCIES Core EG Gpad Graf Hist MathCore Matrix Minuit Net Physics RIO Tree)
+set(ALIROOT_DEPENDENCIES ANALYSIS ANALYSISalice AOD ESD PWGflowTasks PWGflowBase STEERBase TRDbase)
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES})
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Create an object to be reused in case of static libraries 
+# Otherwise the sources will be compiled twice
+add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx)
+# Add a library to the project using the object
+add_library(${MODULE} SHARED $<TARGET_OBJECTS:${MODULE}-object>)
+target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES})
+
+# Setting the correct headers for the object as gathered from the dependencies
+target_include_directories(${MODULE}-object PUBLIC $<TARGET_PROPERTY:${MODULE},INCLUDE_DIRECTORIES>)
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $<TARGET_PROPERTY:${MODULE},COMPILE_DEFINITIONS>)
+
+# Public include folders that will be propagated to the dependecies
+target_include_directories(${MODULE} PUBLIC ${incdirs})
+
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting compilation flags for the object
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+# Setting the linking flags for the library
+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
diff --git a/PWGUD/CMakelibPWGUDFP.pkg b/PWGUD/CMakelibPWGUDFP.pkg
deleted file mode 100644 (file)
index e2f07d6..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for PWGUDFP                                                        #
-# Author : Andras Agocs, 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  
-    FirstPhysics/AliAnalysisTaskFPexample.cxx 
-    FirstPhysics/AliAnalysisTaskFirstPhysics.cxx 
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWGUDFPLinkDef.h)
-
-set ( EINCLUDE  PWGUD/FirstPhysics STEER/STEERBase ANALYSIS)
diff --git a/PWGUD/CMakelibPWGUDbase.pkg b/PWGUD/CMakelibPWGUDbase.pkg
deleted file mode 100644 (file)
index c64682c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for PWGUDbase                                                      #
-# 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 
-    base/dNdEtaAnalysis.cxx 
-    base/AlidNdEtaCorrection.cxx 
-    base/AliCorrectionMatrix.cxx 
-    base/AliCorrectionMatrix2D.cxx 
-    base/AliCorrectionMatrix3D.cxx 
-    base/AliCorrection.cxx 
-    base/AliPWG0Helper.cxx 
-    base/AliMultiplicityCorrection.cxx 
-    base/AliAnalysisTaskdNdetaMC.cxx 
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWGUDbaseLinkDef.h)
-
-set ( EINCLUDE  PWGUD/base STEER/AOD STEER/STEERBase ANALYSIS)
-
-set (EXPORT base/AliPWG0Helper.h)
\ No newline at end of file
diff --git a/PWGUD/CMakelibPWGUDdiffractive.pkg b/PWGUD/CMakelibPWGUDdiffractive.pkg
deleted file mode 100644 (file)
index 5339222..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWGUDdiffractive                                              #
-# Author : Felix Reidt (felix.reidt@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
-  DIFFRACTIVE/example/AliAnalysisTaskCDex.cxx
-  DIFFRACTIVE/example/AliCDMesonUtilsStripped.cxx
-  DIFFRACTIVE/example/AliCDMesonBaseStripped.cxx
-  DIFFRACTIVE/xsAndTwoProng/AliAnalysisTaskCDMeson.cxx
-  DIFFRACTIVE/xsAndTwoProng/AliAnalysisTaskCDskimESD.cxx
-  DIFFRACTIVE/xsAndTwoProng/AliCDMesonUtils.cxx
-  DIFFRACTIVE/xsAndTwoProng/AliCDMesonBase.cxx
-  DIFFRACTIVE/xsAndTwoProng/AliCDMesonTracks.cxx
-  DIFFRACTIVE/QA/AliAnalysisTaskCPQA.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( EINCLUDE PWGUD/DIFFRACTIVE/example PWGUD/DIFFRACTIVE/xsAndTwoProng PWGUD/DIFFRACTIVE/QA ITS PWGPP/ITS STEER/STEER STEER/CDB STEER/STEERBase VZERO ANALYSIS)
-
-set ( DHDR PWGUDdiffractiveLinkDef.h )
diff --git a/PWGUD/CMakelibPWGUDselectors.pkg b/PWGUD/CMakelibPWGUDselectors.pkg
deleted file mode 100644 (file)
index fd479e8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for PWGUDselectors                                                 #
-# 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  
-    selectors/dNdEta/AlidNdEtaTask.cxx 
-    selectors/dNdEta/AlidNdEtaCorrectionTask.cxx 
-    selectors/multiplicity/AliMultiplicityTask.cxx 
-    selectors/trigger/AliTriggerTask.cxx 
-    selectors/eventStats/AliEventStatsTask.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWGUDselectorsLinkDef.h)
-
-set ( EINCLUDE  TPC RAW ITS PWGUD/base PWGUD/selectors/dNdEta PWGUD/selectors/multiplicity PWGUD/selectors/trigger PWGUD/selectors/dNdPt PWGUD/selectors/eventStats ANALYSIS STEER/ESD STEER/STEERBase)
diff --git a/PWGUD/CMakelibPWGUDupc.pkg b/PWGUD/CMakelibPWGUDupc.pkg
deleted file mode 100644 (file)
index b2d5eb5..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for PWGUDdiffractive                                              #
-# Author : Felix Reidt (felix.reidt@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
-  UPC/AliAnalysisTaskUpcPsi2s.cxx
-  UPC/AliAnalysisTaskUpcK0sK0s.cxx
-  UPC/AliAnalysisTaskUpcPhi.cxx
-  UPC/AliUpcParticle.cxx
-  UPC/AliAnalysisTaskUpcTree.cxx
-  UPC/AliUPCTrack.cxx
-  UPC/AliUPCMuonTrack.cxx
-  UPC/AliUPCEvent.cxx
-  UPC/AliAnalysisTaskUpcFilterSemiforward.cxx
-)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( EXPORT
-  UPC/AliUpcParticle.h
-  UPC/AliUPCTrack.h
-  UPC/AliUPCMuonTrack.h
-  UPC/AliUPCEvent.h
-)
-
-set ( EINCLUDE PWGUD/UPC PWG/muon STEER/AOD STEER/ESD STEER/STEERBase VZERO ANALYSIS)
-
-set ( DHDR PWGUDupcLinkDef.h )
index a0ef0a2..a855efc 100644 (file)
@@ -32,11 +32,15 @@ include_directories(${ROOT_INCLUDE_DIRS}
 
 # Sources in alphabetical order
 set(SRCS
+    AliAnalysisTaskUpcFilterSemiforward.cxx
     AliAnalysisTaskUpcK0sK0s.cxx
     AliAnalysisTaskUpcPhi.cxx
     AliAnalysisTaskUpcPsi2s.cxx
     AliAnalysisTaskUpcTree.cxx
+    AliUPCEvent.cxx
+    AliUPCMuonTrack.cxx
     AliUpcParticle.cxx
+    AliUPCTrack.cxx
    )
 
 # Headers from sources