From 51455ade05b296b88c74dccd03c391f394e9e6da Mon Sep 17 00:00:00 2001 From: loizides Date: Mon, 2 Apr 2012 21:33:55 +0000 Subject: [PATCH] factorize tasks --- PWGGA/CMakelibPWGGAEMCALJetTasks.pkg | 50 +++++++++++++++++++ PWGGA/CMakelibPWGGAEMCALTasks.pkg | 16 ------ .../AliEsdJetTask.cxx | 0 .../AliEsdJetTask.h | 0 .../AliFJWrapper.cxx | 0 .../AliFJWrapper.h | 0 .../FJ_includes.h | 0 PWGGA/PWGGAEMCALJetTasksLinkDef.h | 8 +++ PWGGA/PWGGAEMCALTasksLinkDef.h | 1 - 9 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 PWGGA/CMakelibPWGGAEMCALJetTasks.pkg rename PWGGA/{EMCALTasks => EMCALJetTasks}/AliEsdJetTask.cxx (100%) rename PWGGA/{EMCALTasks => EMCALJetTasks}/AliEsdJetTask.h (100%) rename PWGGA/{EMCALTasks => EMCALJetTasks}/AliFJWrapper.cxx (100%) rename PWGGA/{EMCALTasks => EMCALJetTasks}/AliFJWrapper.h (100%) rename PWGGA/{EMCALTasks => EMCALJetTasks}/FJ_includes.h (100%) create mode 100644 PWGGA/PWGGAEMCALJetTasksLinkDef.h diff --git a/PWGGA/CMakelibPWGGAEMCALJetTasks.pkg b/PWGGA/CMakelibPWGGAEMCALJetTasks.pkg new file mode 100644 index 00000000000..e3c44133143 --- /dev/null +++ b/PWGGA/CMakelibPWGGAEMCALJetTasks.pkg @@ -0,0 +1,50 @@ +# -*- mode: Makefile -*- +#--------------------------------------------------------------------------------# +# 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 + EMCALJetTasks/AliEsdJetTask.cxx + EMCALJetTasks/AliFJWrapper.cxx +) + +string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) + +set ( DHDR PWGGAEMCALJetTasksLinkDef.h) + +string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) + +set(FASTJET_ROOT $ENV{FASTJET_ROOT}) +if(FASTJET_ROOT) + set ( EDEFINE -isystem${FASTJET_ROOT}/include) +else() + set(FASTJET $ENV{FASTJET}) + if(FASTJET) + set ( EDEFINE -isystem${FASTJET}/include) + else() + set ( EDEFINE -isystem${ALICE_ROOT}/JETAN/fastjet) + endif(FASTJET) +endif(FASTJET_ROOT) + +set ( EINCLUDE PWGGA/EMCALJetTasks EMCAL OADB STEER/ESD STEER/STEERBase) diff --git a/PWGGA/CMakelibPWGGAEMCALTasks.pkg b/PWGGA/CMakelibPWGGAEMCALTasks.pkg index e2edb81dc29..5b282c7e785 100644 --- a/PWGGA/CMakelibPWGGAEMCALTasks.pkg +++ b/PWGGA/CMakelibPWGGAEMCALTasks.pkg @@ -1,7 +1,5 @@ # -*- mode: Makefile -*- #--------------------------------------------------------------------------------# -# Package File for PWGGAUserTask # -# Author : Yuri Kharlov # # Variables Defined : # # # # SRCS - C++ source files # @@ -41,12 +39,10 @@ set ( SRCS EMCALTasks/AliEmcalSetupTask.cxx EMCALTasks/AliEmcalTrackPropagatorTask.cxx EMCALTasks/AliESDJet.cxx - EMCALTasks/AliEsdJetTask.cxx EMCALTasks/AliEsdSkimTask.cxx EMCALTasks/AliEsdTrackExt.cxx EMCALTasks/AliPicoTrack.cxx EMCALTasks/AliStaObjects.cxx - EMCALTasks/AliFJWrapper.cxx EMCALTasks/AliAnalysisTaskTrgContam.cxx EMCALTasks/AliAnalysisTaskEMCALPhoton.cxx ) @@ -57,16 +53,4 @@ set ( DHDR PWGGAEMCALTasksLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set(FASTJET_ROOT $ENV{FASTJET_ROOT}) -if(FASTJET_ROOT) - set ( EDEFINE "-isystem${FASTJET_ROOT}/include -D__HAVE_FJINTERFACE__") -else() - set(FASTJET $ENV{FASTJET}) - if(FASTJET) - set ( EDEFINE "-isystem${FASTJET}/include -D__HAVE_FJINTERFACE__") - else() - set ( EDEFINE -isystem${ALICE_ROOT}/JETAN/fastjet) - endif(FASTJET) -endif(FASTJET_ROOT) - set ( EINCLUDE PWGGA/EMCALTasks EMCAL OADB STEER/ESD STEER/STEERBase) diff --git a/PWGGA/EMCALTasks/AliEsdJetTask.cxx b/PWGGA/EMCALJetTasks/AliEsdJetTask.cxx similarity index 100% rename from PWGGA/EMCALTasks/AliEsdJetTask.cxx rename to PWGGA/EMCALJetTasks/AliEsdJetTask.cxx diff --git a/PWGGA/EMCALTasks/AliEsdJetTask.h b/PWGGA/EMCALJetTasks/AliEsdJetTask.h similarity index 100% rename from PWGGA/EMCALTasks/AliEsdJetTask.h rename to PWGGA/EMCALJetTasks/AliEsdJetTask.h diff --git a/PWGGA/EMCALTasks/AliFJWrapper.cxx b/PWGGA/EMCALJetTasks/AliFJWrapper.cxx similarity index 100% rename from PWGGA/EMCALTasks/AliFJWrapper.cxx rename to PWGGA/EMCALJetTasks/AliFJWrapper.cxx diff --git a/PWGGA/EMCALTasks/AliFJWrapper.h b/PWGGA/EMCALJetTasks/AliFJWrapper.h similarity index 100% rename from PWGGA/EMCALTasks/AliFJWrapper.h rename to PWGGA/EMCALJetTasks/AliFJWrapper.h diff --git a/PWGGA/EMCALTasks/FJ_includes.h b/PWGGA/EMCALJetTasks/FJ_includes.h similarity index 100% rename from PWGGA/EMCALTasks/FJ_includes.h rename to PWGGA/EMCALJetTasks/FJ_includes.h diff --git a/PWGGA/PWGGAEMCALJetTasksLinkDef.h b/PWGGA/PWGGAEMCALJetTasksLinkDef.h new file mode 100644 index 00000000000..89d2463e20d --- /dev/null +++ b/PWGGA/PWGGAEMCALJetTasksLinkDef.h @@ -0,0 +1,8 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class AliEsdJetTask+; +#endif diff --git a/PWGGA/PWGGAEMCALTasksLinkDef.h b/PWGGA/PWGGAEMCALTasksLinkDef.h index 1b8b8003a3b..e2f608b13a2 100644 --- a/PWGGA/PWGGAEMCALTasksLinkDef.h +++ b/PWGGA/PWGGAEMCALTasksLinkDef.h @@ -18,7 +18,6 @@ #pragma link C++ class AliEmcalPhysicsSelectionTask+; #pragma link C++ class AliEmcalSetupTask+; #pragma link C++ class AliEmcalTrackPropagatorTask+; -#pragma link C++ class AliEsdJetTask+; #pragma link C++ class AliEsdSkimTask+; #pragma link C++ class AliEsdTrackExt+; #pragma link C++ class AliPicoTrack+; -- 2.43.0