Moving some classes in more appropiate places
authorjgrosseo <jgrosseo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 16 Nov 2011 14:44:35 +0000 (14:44 +0000)
committerjgrosseo <jgrosseo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 16 Nov 2011 14:44:35 +0000 (14:44 +0000)
- EventPoolManager is now in ANALYSISalice
- Correlation base classes in CorrelationsBase
- Correlation delta phi tasks in CorrelationsDPhi

22 files changed:
ANALYSIS/ANALYSISaliceLinkDef.h
ANALYSIS/AliEventPoolManager.cxx [moved from PWG4/JetTasks/AliEventPoolManager.cxx with 100% similarity]
ANALYSIS/AliEventPoolManager.h [moved from PWG4/JetTasks/AliEventPoolManager.h with 98% similarity]
ANALYSIS/CMakelibANALYSISalice.pkg
PWG4/CMakelibPWG4CorrelationsBase.pkg [new file with mode: 0644]
PWG4/CMakelibPWG4CorrelationsDPhi.pkg [new file with mode: 0644]
PWG4/CMakelibPWG4JetTasks.pkg
PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.cxx [moved from PWG4/JetTasks/AliAnalyseLeadingTrackUE.cxx with 100% similarity]
PWG4/CorrelationsBase/AliAnalyseLeadingTrackUE.h [moved from PWG4/JetTasks/AliAnalyseLeadingTrackUE.h with 100% similarity]
PWG4/CorrelationsBase/AliTHn.cxx [moved from PWG4/JetTasks/AliTHn.cxx with 100% similarity]
PWG4/CorrelationsBase/AliTHn.h [moved from PWG4/JetTasks/AliTHn.h with 100% similarity]
PWG4/CorrelationsBase/AliUEHist.cxx [moved from PWG4/JetTasks/AliUEHist.cxx with 100% similarity]
PWG4/CorrelationsBase/AliUEHist.h [moved from PWG4/JetTasks/AliUEHist.h with 100% similarity]
PWG4/CorrelationsBase/AliUEHistograms.cxx [moved from PWG4/JetTasks/AliUEHistograms.cxx with 100% similarity]
PWG4/CorrelationsBase/AliUEHistograms.h [moved from PWG4/JetTasks/AliUEHistograms.h with 100% similarity]
PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.cxx [moved from PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.cxx with 99% similarity]
PWG4/CorrelationsDPhi/AliAnalysisTaskPhiCorrelations.h [moved from PWG4/JetTasks/AliAnalysisTaskPhiCorrelations.h with 100% similarity]
PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.cxx [moved from PWG4/JetTasks/AliPhiCorrelationsQATask.cxx with 100% similarity]
PWG4/CorrelationsDPhi/AliPhiCorrelationsQATask.h [moved from PWG4/JetTasks/AliPhiCorrelationsQATask.h with 100% similarity]
PWG4/PWG4CorrelationsBaseLinkDef.h [new file with mode: 0644]
PWG4/PWG4CorrelationsDPhiLinkDef.h [new file with mode: 0644]
PWG4/PWG4JetTasksLinkDef.h

index 4d0ce59..3ec2be9 100644 (file)
@@ -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+;
similarity index 98%
rename from PWG4/JetTasks/AliEventPoolManager.h
rename to ANALYSIS/AliEventPoolManager.h
index 913bf0a..b7d2e1a 100644 (file)
@@ -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
 
index a57a3a3..7a0cff2 100644 (file)
@@ -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 (file)
index 0000000..7f5c508
--- /dev/null
@@ -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 (file)
index 0000000..655c539
--- /dev/null
@@ -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)
index a395c2d..d7d74f6 100644 (file)
@@ -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}" )
 #include <TTree.h>
 #include <TH2F.h>
 #include <TRandom.h>
-#include <TMCProcess.h>
 
 #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/PWG4CorrelationsBaseLinkDef.h b/PWG4/PWG4CorrelationsBaseLinkDef.h
new file mode 100644 (file)
index 0000000..9c85de7
--- /dev/null
@@ -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 (file)
index 0000000..7a24652
--- /dev/null
@@ -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
index c57ca2e..4bf88da 100644 (file)
 #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