From 3d4e011dd95b064b660a3daab5932c939d126d7c Mon Sep 17 00:00:00 2001 From: jgrosseo Date: Wed, 16 Nov 2011 14:44:35 +0000 Subject: [PATCH] Moving some classes in more appropiate places - EventPoolManager is now in ANALYSISalice - Correlation base classes in CorrelationsBase - Correlation delta phi tasks in CorrelationsDPhi --- ANALYSIS/ANALYSISaliceLinkDef.h | 3 ++ .../AliEventPoolManager.cxx | 0 .../AliEventPoolManager.h | 2 +- ANALYSIS/CMakelibANALYSISalice.pkg | 1 + PWG4/CMakelibPWG4CorrelationsBase.pkg | 42 +++++++++++++++++++ PWG4/CMakelibPWG4CorrelationsDPhi.pkg | 40 ++++++++++++++++++ PWG4/CMakelibPWG4JetTasks.pkg | 7 ---- .../AliAnalyseLeadingTrackUE.cxx | 0 .../AliAnalyseLeadingTrackUE.h | 0 .../{JetTasks => CorrelationsBase}/AliTHn.cxx | 0 PWG4/{JetTasks => CorrelationsBase}/AliTHn.h | 0 .../AliUEHist.cxx | 0 .../AliUEHist.h | 0 .../AliUEHistograms.cxx | 0 .../AliUEHistograms.h | 0 .../AliAnalysisTaskPhiCorrelations.cxx | 3 -- .../AliAnalysisTaskPhiCorrelations.h | 0 .../AliPhiCorrelationsQATask.cxx | 0 .../AliPhiCorrelationsQATask.h | 0 PWG4/PWG4CorrelationsBaseLinkDef.h | 12 ++++++ PWG4/PWG4CorrelationsDPhiLinkDef.h | 11 +++++ PWG4/PWG4JetTasksLinkDef.h | 9 ---- 22 files changed, 110 insertions(+), 20 deletions(-) rename {PWG4/JetTasks => ANALYSIS}/AliEventPoolManager.cxx (100%) rename {PWG4/JetTasks => ANALYSIS}/AliEventPoolManager.h (98%) create mode 100644 PWG4/CMakelibPWG4CorrelationsBase.pkg create mode 100644 PWG4/CMakelibPWG4CorrelationsDPhi.pkg rename PWG4/{JetTasks => CorrelationsBase}/AliAnalyseLeadingTrackUE.cxx (100%) rename PWG4/{JetTasks => CorrelationsBase}/AliAnalyseLeadingTrackUE.h (100%) rename PWG4/{JetTasks => CorrelationsBase}/AliTHn.cxx (100%) rename PWG4/{JetTasks => CorrelationsBase}/AliTHn.h (100%) rename PWG4/{JetTasks => CorrelationsBase}/AliUEHist.cxx (100%) rename PWG4/{JetTasks => CorrelationsBase}/AliUEHist.h (100%) rename PWG4/{JetTasks => CorrelationsBase}/AliUEHistograms.cxx (100%) rename PWG4/{JetTasks => CorrelationsBase}/AliUEHistograms.h (100%) rename PWG4/{JetTasks => CorrelationsDPhi}/AliAnalysisTaskPhiCorrelations.cxx (99%) rename PWG4/{JetTasks => CorrelationsDPhi}/AliAnalysisTaskPhiCorrelations.h (100%) rename PWG4/{JetTasks => CorrelationsDPhi}/AliPhiCorrelationsQATask.cxx (100%) rename PWG4/{JetTasks => CorrelationsDPhi}/AliPhiCorrelationsQATask.h (100%) create mode 100644 PWG4/PWG4CorrelationsBaseLinkDef.h create mode 100644 PWG4/PWG4CorrelationsDPhiLinkDef.h diff --git a/ANALYSIS/ANALYSISaliceLinkDef.h b/ANALYSIS/ANALYSISaliceLinkDef.h index 4d0ce59a02a..3ec2be9bf04 100644 --- a/ANALYSIS/ANALYSISaliceLinkDef.h +++ b/ANALYSIS/ANALYSISaliceLinkDef.h @@ -43,6 +43,9 @@ #pragma link C++ class AliAnalysisTaskPIDqa+; #pragma link C++ class AliAnalysisTaskBaseLine+; +#pragma link C++ class AliEventPool+; +#pragma link C++ class AliEventPoolManager+; + #ifdef WITHXML #pragma link C++ class AliTagAnalysis+; #pragma link C++ class AliXMLCollection+; diff --git a/PWG4/JetTasks/AliEventPoolManager.cxx b/ANALYSIS/AliEventPoolManager.cxx similarity index 100% rename from PWG4/JetTasks/AliEventPoolManager.cxx rename to ANALYSIS/AliEventPoolManager.cxx diff --git a/PWG4/JetTasks/AliEventPoolManager.h b/ANALYSIS/AliEventPoolManager.h similarity index 98% rename from PWG4/JetTasks/AliEventPoolManager.h rename to ANALYSIS/AliEventPoolManager.h index 913bf0a7236..b7d2e1ac995 100644 --- a/PWG4/JetTasks/AliEventPoolManager.h +++ b/ANALYSIS/AliEventPoolManager.h @@ -18,7 +18,7 @@ // TObject. Pools are updated based on maintaining a minimum fixed // number of tracks. Multiplicity/centrality and z-vertex bins must be // passed in at initialization. For example of implementation, see -// $ALICE_ROOT/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx +// $ALICE_ROOT/PWG4/Correlations/AliAnalysisTaskPhiCorrelations.cxx // // Authors: A. Adare and C. Loizides diff --git a/ANALYSIS/CMakelibANALYSISalice.pkg b/ANALYSIS/CMakelibANALYSISalice.pkg index a57a3a36a01..7a0cff27a74 100644 --- a/ANALYSIS/CMakelibANALYSISalice.pkg +++ b/ANALYSIS/CMakelibANALYSISalice.pkg @@ -58,6 +58,7 @@ set ( SRCS AliHEPDataParser.cxx AliAnalysisTaskPIDqa.cxx AliAnalysisTaskBaseLine.cxx + AliEventPoolManager.cxx ) if( ROOTHASALIEN STREQUAL "yes") diff --git a/PWG4/CMakelibPWG4CorrelationsBase.pkg b/PWG4/CMakelibPWG4CorrelationsBase.pkg new file mode 100644 index 00000000000..7f5c5081d23 --- /dev/null +++ b/PWG4/CMakelibPWG4CorrelationsBase.pkg @@ -0,0 +1,42 @@ +# -*- 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 + CorrelationsBase/AliUEHistograms.cxx + CorrelationsBase/AliUEHist.cxx + CorrelationsBase/AliAnalyseLeadingTrackUE.cxx + CorrelationsBase/AliTHn.cxx + ) + +string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) + +set ( DHDR PWG4CorrelationsBaseLinkDef.h) + +string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) + +set ( EINCLUDE ANALYSIS CORRFW PWG4/CorrelationsBase STEER/AOD STEER/ESD STEER/STEERBase) diff --git a/PWG4/CMakelibPWG4CorrelationsDPhi.pkg b/PWG4/CMakelibPWG4CorrelationsDPhi.pkg new file mode 100644 index 00000000000..655c539de6c --- /dev/null +++ b/PWG4/CMakelibPWG4CorrelationsDPhi.pkg @@ -0,0 +1,40 @@ +# -*- 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 + CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx + CorrelationsDPhi/AliPhiCorrelationsQATask.cxx + ) + +string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) + +set ( DHDR PWG4CorrelationsDPhiLinkDef.h) + +string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) + +set ( EINCLUDE ANALYSIS CORRFW PWG4/CorrelationsBase PWG4/CorrelationsDPhi STEER/AOD STEER/ESD STEER/STEERBase) diff --git a/PWG4/CMakelibPWG4JetTasks.pkg b/PWG4/CMakelibPWG4JetTasks.pkg index a395c2d1691..d7d74f68ceb 100644 --- a/PWG4/CMakelibPWG4JetTasks.pkg +++ b/PWG4/CMakelibPWG4JetTasks.pkg @@ -46,19 +46,12 @@ set ( SRCS JetTasks/AliAnalysisTaskJetChem.cxx JetTasks/AliAnalysisTaskFragmentationFunction.cxx JetTasks/AliAnalysisTaskMinijet.cxx - JetTasks/AliUEHist.cxx - JetTasks/AliUEHistograms.cxx - JetTasks/AliAnalyseLeadingTrackUE.cxx JetTasks/AliAnalysisTaskLeadingTrackUE.cxx JetTasks/AliAnalysisTaskQGSep.cxx JetTasks/AliAnalysisTaskJetsTM.cxx JetTasks/AliAnalysisTaskJetResponse.cxx JetTasks/AliPWG4HighPtTrackQA.cxx - JetTasks/AliEventPoolManager.cxx - JetTasks/AliPhiCorrelationsQATask.cxx - JetTasks/AliAnalysisTaskPhiCorrelations.cxx JetTasks/AliAnalysisTaskJetResponseV2.cxx - JetTasks/AliTHn.cxx ) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) diff --git a/PWG4/JetTasks/AliAnalyseLeadingTrackUE.cxx b/PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.cxx similarity index 100% rename from PWG4/JetTasks/AliAnalyseLeadingTrackUE.cxx rename to PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.cxx diff --git a/PWG4/JetTasks/AliAnalyseLeadingTrackUE.h b/PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.h similarity index 100% rename from PWG4/JetTasks/AliAnalyseLeadingTrackUE.h rename to PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.h diff --git a/PWG4/JetTasks/AliTHn.cxx b/PWG4/CorrelationsBase/AliTHn.cxx similarity index 100% rename from PWG4/JetTasks/AliTHn.cxx rename to PWG4/CorrelationsBase/AliTHn.cxx diff --git a/PWG4/JetTasks/AliTHn.h b/PWG4/CorrelationsBase/AliTHn.h similarity index 100% rename from PWG4/JetTasks/AliTHn.h rename to PWG4/CorrelationsBase/AliTHn.h diff --git a/PWG4/JetTasks/AliUEHist.cxx b/PWG4/CorrelationsBase/AliUEHist.cxx similarity index 100% rename from PWG4/JetTasks/AliUEHist.cxx rename to PWG4/CorrelationsBase/AliUEHist.cxx diff --git a/PWG4/JetTasks/AliUEHist.h b/PWG4/CorrelationsBase/AliUEHist.h similarity index 100% rename from PWG4/JetTasks/AliUEHist.h rename to PWG4/CorrelationsBase/AliUEHist.h diff --git a/PWG4/JetTasks/AliUEHistograms.cxx b/PWG4/CorrelationsBase/AliUEHistograms.cxx similarity index 100% rename from PWG4/JetTasks/AliUEHistograms.cxx rename to PWG4/CorrelationsBase/AliUEHistograms.cxx diff --git a/PWG4/JetTasks/AliUEHistograms.h b/PWG4/CorrelationsBase/AliUEHistograms.h similarity index 100% rename from PWG4/JetTasks/AliUEHistograms.h rename to PWG4/CorrelationsBase/AliUEHistograms.h diff --git a/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx b/PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx similarity index 99% rename from PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx rename to PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx index c19cf5ef177..2a7d0ddc7e1 100644 --- a/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx +++ b/PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx @@ -23,19 +23,16 @@ #include #include #include -#include #include "AliAnalysisTaskPhiCorrelations.h" #include "AliAnalyseLeadingTrackUE.h" #include "AliUEHistograms.h" #include "AliUEHist.h" -#include "AliAnalysisHelperJetTasks.h" #include "AliAnalysisManager.h" #include "AliAODHandler.h" #include "AliAODInputHandler.h" #include "AliAODMCParticle.h" -#include "AliGenPythiaEventHeader.h" #include "AliInputEventHandler.h" #include "AliLog.h" #include "AliMCEventHandler.h" diff --git a/PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.h b/PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.h similarity index 100% rename from PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.h rename to PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.h diff --git a/PWG4/JetTasks/AliPhiCorrelationsQATask.cxx b/PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.cxx similarity index 100% rename from PWG4/JetTasks/AliPhiCorrelationsQATask.cxx rename to PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.cxx diff --git a/PWG4/JetTasks/AliPhiCorrelationsQATask.h b/PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.h similarity index 100% rename from PWG4/JetTasks/AliPhiCorrelationsQATask.h rename to PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.h diff --git a/PWG4/PWG4CorrelationsBaseLinkDef.h b/PWG4/PWG4CorrelationsBaseLinkDef.h new file mode 100644 index 00000000000..9c85de7724a --- /dev/null +++ b/PWG4/PWG4CorrelationsBaseLinkDef.h @@ -0,0 +1,12 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class AliUEHist+; +#pragma link C++ class AliUEHistograms+; +#pragma link C++ class AliTHn+; +#pragma link C++ class AliAnalyseLeadingTrackUE+; + +#endif diff --git a/PWG4/PWG4CorrelationsDPhiLinkDef.h b/PWG4/PWG4CorrelationsDPhiLinkDef.h new file mode 100644 index 00000000000..7a246528327 --- /dev/null +++ b/PWG4/PWG4CorrelationsDPhiLinkDef.h @@ -0,0 +1,11 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class AliAnalysisTaskPhiCorrelations+; +#pragma link C++ class AliDPhiBasicParticle+; +#pragma link C++ class AliPhiCorrelationsQATask+; + +#endif diff --git a/PWG4/PWG4JetTasksLinkDef.h b/PWG4/PWG4JetTasksLinkDef.h index c57ca2eda25..4bf88da5274 100644 --- a/PWG4/PWG4JetTasksLinkDef.h +++ b/PWG4/PWG4JetTasksLinkDef.h @@ -32,19 +32,10 @@ #pragma link C++ class AliAnalysisTaskJetChem::AliFragFuncHistosInvMass+; #pragma link C++ class AliAnalysisTaskJetChem::AliFragFuncHistosPhiCorrInvMass+; #pragma link C++ class AliAnalysisTaskMinijet+; -#pragma link C++ class AliUEHist+; -#pragma link C++ class AliUEHistograms+; -#pragma link C++ class AliAnalyseLeadingTrackUE+; #pragma link C++ class AliAnalysisTaskLeadingTrackUE+; #pragma link C++ class AliAnalysisTaskJetsTM+; #pragma link C++ class AliAnalysisTaskQGSep+; #pragma link C++ class AliAnalysisTaskJetResponse+; #pragma link C++ class AliAnalysisTaskJetResponseV2; -#pragma link C++ class AliAnalysisTaskPhiCorrelations+; -#pragma link C++ class AliDPhiBasicParticle+; -#pragma link C++ class AliEventPool+; -#pragma link C++ class AliEventPoolManager+; -#pragma link C++ class AliPhiCorrelationsQATask+; -#pragma link C++ class AliTHn+; #endif -- 2.39.3