From c0ff24c69df825ba6ef4c32d39bd4dc6c8f880b5 Mon Sep 17 00:00:00 2001 From: jgrosseo Date: Wed, 16 Nov 2011 17:27:38 +0000 Subject: [PATCH] Adding PWG4Base library Moving AliAnalysisHelperJetTasks into that library Moving AliAnalysisTaskLeadingTrackUE to CorrelationsDPhi --- .../AliAnalysisHelperJetTasks.cxx | 1 + .../AliAnalysisHelperJetTasks.h | 1 + PWG4/CMakelibPWG4Base.pkg | 39 +++++++++++++++++++ PWG4/CMakelibPWG4CorrelationsDPhi.pkg | 3 +- PWG4/CMakelibPWG4JetTasks.pkg | 4 +- .../AliAnalysisTaskLeadingTrackUE.cxx | 0 .../AliAnalysisTaskLeadingTrackUE.h | 0 PWG4/PWG4BaseLinkDef.h | 9 +++++ PWG4/PWG4CorrelationsDPhiLinkDef.h | 1 + PWG4/PWG4JetTasksLinkDef.h | 2 - PWG4/macros/AddTaskLeadingTrackUE.C | 2 +- 11 files changed, 55 insertions(+), 7 deletions(-) rename PWG4/{JetTasks => Base}/AliAnalysisHelperJetTasks.cxx (99%) rename PWG4/{JetTasks => Base}/AliAnalysisHelperJetTasks.h (99%) create mode 100644 PWG4/CMakelibPWG4Base.pkg rename PWG4/{JetTasks => CorrelationsDPhi}/AliAnalysisTaskLeadingTrackUE.cxx (100%) rename PWG4/{JetTasks => CorrelationsDPhi}/AliAnalysisTaskLeadingTrackUE.h (100%) create mode 100644 PWG4/PWG4BaseLinkDef.h diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx b/PWG4/Base/AliAnalysisHelperJetTasks.cxx similarity index 99% rename from PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx rename to PWG4/Base/AliAnalysisHelperJetTasks.cxx index cdff2dfc4ad..2d29171fc6a 100644 --- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx +++ b/PWG4/Base/AliAnalysisHelperJetTasks.cxx @@ -33,6 +33,7 @@ #include "TString.h" #include "TArrayI.h" #include "TArrayS.h" +#include "TArrayF.h" #include "AliMCEvent.h" #include "AliLog.h" diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.h b/PWG4/Base/AliAnalysisHelperJetTasks.h similarity index 99% rename from PWG4/JetTasks/AliAnalysisHelperJetTasks.h rename to PWG4/Base/AliAnalysisHelperJetTasks.h index c90f51c9364..4627f57fdd8 100644 --- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.h +++ b/PWG4/Base/AliAnalysisHelperJetTasks.h @@ -7,6 +7,7 @@ class AliAODJet; class AliVEvent; class TString; class TArrayI; +class TArrayF; class AliGenPythiaEventHeader; class TVector3; class AliGenEventHeader; diff --git a/PWG4/CMakelibPWG4Base.pkg b/PWG4/CMakelibPWG4Base.pkg new file mode 100644 index 00000000000..b71b776ccb2 --- /dev/null +++ b/PWG4/CMakelibPWG4Base.pkg @@ -0,0 +1,39 @@ +# -*- 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 + Base/AliAnalysisHelperJetTasks.cxx + ) + +string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) + +set ( DHDR PWG4BaseLinkDef.h) + +string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) + +set ( EINCLUDE ANALYSIS CORRFW PWG4/Base STEER/AOD STEER/ESD STEER/STEERBase) diff --git a/PWG4/CMakelibPWG4CorrelationsDPhi.pkg b/PWG4/CMakelibPWG4CorrelationsDPhi.pkg index 655c539de6c..2f2f22360dd 100644 --- a/PWG4/CMakelibPWG4CorrelationsDPhi.pkg +++ b/PWG4/CMakelibPWG4CorrelationsDPhi.pkg @@ -29,6 +29,7 @@ set ( SRCS CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx CorrelationsDPhi/AliPhiCorrelationsQATask.cxx + CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.cxx ) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) @@ -37,4 +38,4 @@ set ( DHDR PWG4CorrelationsDPhiLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE ANALYSIS CORRFW PWG4/CorrelationsBase PWG4/CorrelationsDPhi STEER/AOD STEER/ESD STEER/STEERBase) +set ( EINCLUDE ANALYSIS CORRFW PWG4/CorrelationsBase PWG4/CorrelationsDPhi PWG4/Base STEER/AOD STEER/ESD STEER/STEERBase) diff --git a/PWG4/CMakelibPWG4JetTasks.pkg b/PWG4/CMakelibPWG4JetTasks.pkg index d7d74f68ceb..5a42af9cd67 100644 --- a/PWG4/CMakelibPWG4JetTasks.pkg +++ b/PWG4/CMakelibPWG4JetTasks.pkg @@ -32,7 +32,6 @@ set ( SRCS JetTasks/AliAnalyseUE.cxx JetTasks/AliAnalysisTaskJetSpectrum.cxx JetTasks/AliAnalysisTaskJetSpectrum2.cxx - JetTasks/AliAnalysisHelperJetTasks.cxx JetTasks/AliAnalysisTaskJetServices.cxx JetTasks/AliAnalysisTaskPWG4PidDetEx.cxx JetTasks/AliJetSpectrumUnfolding.cxx @@ -46,7 +45,6 @@ set ( SRCS JetTasks/AliAnalysisTaskJetChem.cxx JetTasks/AliAnalysisTaskFragmentationFunction.cxx JetTasks/AliAnalysisTaskMinijet.cxx - JetTasks/AliAnalysisTaskLeadingTrackUE.cxx JetTasks/AliAnalysisTaskQGSep.cxx JetTasks/AliAnalysisTaskJetsTM.cxx JetTasks/AliAnalysisTaskJetResponse.cxx @@ -60,4 +58,4 @@ set ( DHDR PWG4JetTasksLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE ANALYSIS JETAN CORRFW PWG4/JetTasks STEER/AOD STEER/ESD STEER/STEERBase) +set ( EINCLUDE ANALYSIS JETAN CORRFW PWG4/JetTasks PWG4/Base STEER/AOD STEER/ESD STEER/STEERBase) diff --git a/PWG4/JetTasks/AliAnalysisTaskLeadingTrackUE.cxx b/PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.cxx similarity index 100% rename from PWG4/JetTasks/AliAnalysisTaskLeadingTrackUE.cxx rename to PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.cxx diff --git a/PWG4/JetTasks/AliAnalysisTaskLeadingTrackUE.h b/PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.h similarity index 100% rename from PWG4/JetTasks/AliAnalysisTaskLeadingTrackUE.h rename to PWG4/CorrelationsDPhi/AliAnalysisTaskLeadingTrackUE.h diff --git a/PWG4/PWG4BaseLinkDef.h b/PWG4/PWG4BaseLinkDef.h new file mode 100644 index 00000000000..11fbef0025e --- /dev/null +++ b/PWG4/PWG4BaseLinkDef.h @@ -0,0 +1,9 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class AliAnalysisHelperJetTasks+; + +#endif diff --git a/PWG4/PWG4CorrelationsDPhiLinkDef.h b/PWG4/PWG4CorrelationsDPhiLinkDef.h index 7a246528327..017103081e8 100644 --- a/PWG4/PWG4CorrelationsDPhiLinkDef.h +++ b/PWG4/PWG4CorrelationsDPhiLinkDef.h @@ -7,5 +7,6 @@ #pragma link C++ class AliAnalysisTaskPhiCorrelations+; #pragma link C++ class AliDPhiBasicParticle+; #pragma link C++ class AliPhiCorrelationsQATask+; +#pragma link C++ class AliAnalysisTaskLeadingTrackUE+; #endif diff --git a/PWG4/PWG4JetTasksLinkDef.h b/PWG4/PWG4JetTasksLinkDef.h index 4bf88da5274..bc5381fef42 100644 --- a/PWG4/PWG4JetTasksLinkDef.h +++ b/PWG4/PWG4JetTasksLinkDef.h @@ -11,7 +11,6 @@ #pragma link C++ class AliAnalysisTaskJetSpectrum+; #pragma link C++ class AliAnalysisTaskJetSpectrum2+; #pragma link C++ class AliAnalysisTaskJFSystematics+; -#pragma link C++ class AliAnalysisHelperJetTasks+; #pragma link C++ class AliAnalysisTaskJetCorrections+; #pragma link C++ class AliAnalysisTaskThreeJets+; #pragma link C++ class AliPWG4HighPtQATPConly+; @@ -32,7 +31,6 @@ #pragma link C++ class AliAnalysisTaskJetChem::AliFragFuncHistosInvMass+; #pragma link C++ class AliAnalysisTaskJetChem::AliFragFuncHistosPhiCorrInvMass+; #pragma link C++ class AliAnalysisTaskMinijet+; -#pragma link C++ class AliAnalysisTaskLeadingTrackUE+; #pragma link C++ class AliAnalysisTaskJetsTM+; #pragma link C++ class AliAnalysisTaskQGSep+; #pragma link C++ class AliAnalysisTaskJetResponse+; diff --git a/PWG4/macros/AddTaskLeadingTrackUE.C b/PWG4/macros/AddTaskLeadingTrackUE.C index ae7966e4ac4..774d14317d7 100644 --- a/PWG4/macros/AddTaskLeadingTrackUE.C +++ b/PWG4/macros/AddTaskLeadingTrackUE.C @@ -1,6 +1,6 @@ -void ConfigTaskUE(AliAnalysisTaskUE * ueana ); // common config, extend with different cases +void ConfigTaskUE(AliAnalysisTaskLeadingTrackUE * ueana ); // common config, extend with different cases AliAnalysisTaskLeadingTrackUE *AddTaskLeadingTrackUE(Int_t analysisMode = 0) { -- 2.39.3