]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
spring cleaning, split flow lib into two
authorsnelling <snelling@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 12 Feb 2009 12:24:46 +0000 (12:24 +0000)
committersnelling <snelling@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 12 Feb 2009 12:24:46 +0000 (12:24 +0000)
82 files changed:
PWG2/CMakeLists.txt
PWG2/CMake_libPWG2flow.txt [deleted file]
PWG2/CMake_libPWG2flowCommon.txt [new file with mode: 0644]
PWG2/CMake_libPWG2flowTasks.txt [new file with mode: 0644]
PWG2/FLOW/AliFlowCommon/AliCumulantsFunctions.cxx [moved from PWG2/FLOW/AliCumulantsFunctions.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliCumulantsFunctions.h [moved from PWG2/FLOW/AliCumulantsFunctions.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFittingFunctionsForQDistribution.cxx [moved from PWG2/FLOW/AliFittingFunctionsForQDistribution.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFittingFunctionsForQDistribution.h [moved from PWG2/FLOW/AliFittingFunctionsForQDistribution.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFittingQDistribution.cxx [moved from PWG2/FLOW/AliFittingQDistribution.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFittingQDistribution.h [moved from PWG2/FLOW/AliFittingQDistribution.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithCumulants.cxx [moved from PWG2/FLOW/AliFlowAnalysisWithCumulants.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithCumulants.h [moved from PWG2/FLOW/AliFlowAnalysisWithCumulants.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx [moved from PWG2/FLOW/AliFlowAnalysisWithLYZEventPlane.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.h [moved from PWG2/FLOW/AliFlowAnalysisWithLYZEventPlane.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx [moved from PWG2/FLOW/AliFlowAnalysisWithLeeYangZeros.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.h [moved from PWG2/FLOW/AliFlowAnalysisWithLeeYangZeros.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx [moved from PWG2/FLOW/AliFlowAnalysisWithMCEventPlane.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithMCEventPlane.h [moved from PWG2/FLOW/AliFlowAnalysisWithMCEventPlane.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx [moved from PWG2/FLOW/AliFlowAnalysisWithQCumulants.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h [moved from PWG2/FLOW/AliFlowAnalysisWithQCumulants.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx [moved from PWG2/FLOW/AliFlowAnalysisWithScalarProduct.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.h [moved from PWG2/FLOW/AliFlowAnalysisWithScalarProduct.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCommonConstants.cxx [moved from PWG2/FLOW/AliFlowCommonConstants.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCommonConstants.h [moved from PWG2/FLOW/AliFlowCommonConstants.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.cxx [moved from PWG2/FLOW/AliFlowCommonHist.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h [moved from PWG2/FLOW/AliFlowCommonHist.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCommonHistResults.cxx [moved from PWG2/FLOW/AliFlowCommonHistResults.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCommonHistResults.h [moved from PWG2/FLOW/AliFlowCommonHistResults.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCumuConstants.cxx [moved from PWG2/FLOW/AliFlowCumuConstants.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowCumuConstants.h [moved from PWG2/FLOW/AliFlowCumuConstants.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowEventSimple.cxx [moved from PWG2/FLOW/AliFlowEventSimple.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowEventSimple.h [moved from PWG2/FLOW/AliFlowEventSimple.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZConstants.cxx [moved from PWG2/FLOW/AliFlowLYZConstants.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZConstants.h [moved from PWG2/FLOW/AliFlowLYZConstants.h with 90% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZEventPlane.cxx [moved from PWG2/FLOW/AliFlowLYZEventPlane.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZEventPlane.h [moved from PWG2/FLOW/AliFlowLYZEventPlane.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZHist1.cxx [moved from PWG2/FLOW/AliFlowLYZHist1.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZHist1.h [moved from PWG2/FLOW/AliFlowLYZHist1.h with 97% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZHist2.cxx [moved from PWG2/FLOW/AliFlowLYZHist2.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowLYZHist2.h [moved from PWG2/FLOW/AliFlowLYZHist2.h with 97% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.cxx [moved from PWG2/FLOW/AliFlowTrackSimple.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowTrackSimple.h [moved from PWG2/FLOW/AliFlowTrackSimple.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx [moved from PWG2/FLOW/AliFlowTrackSimpleCuts.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.h [moved from PWG2/FLOW/AliFlowTrackSimpleCuts.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowVector.cxx [moved from PWG2/FLOW/AliFlowVector.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliFlowVector.h [moved from PWG2/FLOW/AliFlowVector.h with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliQCumulantsFunctions.cxx [moved from PWG2/FLOW/AliQCumulantsFunctions.cxx with 100% similarity]
PWG2/FLOW/AliFlowCommon/AliQCumulantsFunctions.h [moved from PWG2/FLOW/AliQCumulantsFunctions.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskCumulants.cxx [moved from PWG2/FLOW/AliAnalysisTaskCumulants.cxx with 99% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskCumulants.h [moved from PWG2/FLOW/AliAnalysisTaskCumulants.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.cxx [moved from PWG2/FLOW/AliAnalysisTaskFittingQDistribution.cxx with 99% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.h [moved from PWG2/FLOW/AliAnalysisTaskFittingQDistribution.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx [moved from PWG2/FLOW/AliAnalysisTaskLYZEventPlane.cxx with 99% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.h [moved from PWG2/FLOW/AliAnalysisTaskLYZEventPlane.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx [moved from PWG2/FLOW/AliAnalysisTaskLeeYangZeros.cxx with 99% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.h [moved from PWG2/FLOW/AliAnalysisTaskLeeYangZeros.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx [moved from PWG2/FLOW/AliAnalysisTaskMCEventPlane.cxx with 99% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.h [moved from PWG2/FLOW/AliAnalysisTaskMCEventPlane.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx [moved from PWG2/FLOW/AliAnalysisTaskQCumulants.cxx with 99% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h [moved from PWG2/FLOW/AliAnalysisTaskQCumulants.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx [moved from PWG2/FLOW/AliAnalysisTaskScalarProduct.cxx with 99% similarity]
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.h [moved from PWG2/FLOW/AliAnalysisTaskScalarProduct.h with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliFlowEventSimpleMaker.cxx [moved from PWG2/FLOW/AliFlowEventSimpleMaker.cxx with 100% similarity]
PWG2/FLOW/AliFlowTasks/AliFlowEventSimpleMaker.h [moved from PWG2/FLOW/AliFlowEventSimpleMaker.h with 100% similarity]
PWG2/FLOW/macros/CompareFlowResults.C
PWG2/FLOW/macros/makeWeights.C
PWG2/FLOW/macros/runAliAnalysisTaskFlow.C
PWG2/FLOW/macros/runFlowAnalysis.C
PWG2/FLOW/macros/runProofFlow.C
PWG2/Makefile
PWG2/PROOF-INF.PWG2/BUILD.sh
PWG2/PROOF-INF.PWG2flow/BUILD.sh [deleted file]
PWG2/PROOF-INF.PWG2flow/SETUP.C [deleted file]
PWG2/PROOF-INF.PWG2flowCommon/BUILD.sh [new file with mode: 0755]
PWG2/PROOF-INF.PWG2flowCommon/SETUP.C [new file with mode: 0644]
PWG2/PROOF-INF.PWG2flowTasks/BUILD.sh [new file with mode: 0755]
PWG2/PROOF-INF.PWG2flowTasks/SETUP.C [new file with mode: 0644]
PWG2/PWG2flowCommonLinkDef.h [moved from PWG2/PWG2flowLinkDef.h with 73% similarity]
PWG2/PWG2flowTasksLinkDef.h [new file with mode: 0644]
PWG2/libPWG2flow.pkg [deleted file]
PWG2/libPWG2flowCommon.pkg [new file with mode: 0644]
PWG2/libPWG2flowTasks.pkg [new file with mode: 0644]

index d30669da29c38aa43dd0164f292e5239396d022b..7bbaebb78cb0086af0df8268c4c51b1057158235 100644 (file)
@@ -12,7 +12,8 @@ ${CMAKE_SOURCE_DIR}/PWG2/EBYE/LRC
 ${CMAKE_SOURCE_DIR}/PWG2/FEMTOSCOPY
 ${CMAKE_SOURCE_DIR}/PWG2/FEMTOSCOPY/AliFemto
 ${CMAKE_SOURCE_DIR}/PWG2/FEMTOSCOPY/AliFemtoUser
-${CMAKE_SOURCE_DIR}/PWG2/FLOW
+${CMAKE_SOURCE_DIR}/PWG2/FLOW/AliFlowCommon
+${CMAKE_SOURCE_DIR}/PWG2/FLOW/AliFlowTasks
 ${CMAKE_SOURCE_DIR}/PWG2/SPECTRA
 ${CMAKE_SOURCE_DIR}/STEER
 ${CMAKE_SOURCE_DIR}/CORRFW
@@ -32,7 +33,9 @@ SetModule()
 
 include(CMake_libPWG2spectra.txt)
 
-include(CMake_libPWG2flow.txt)
+include(CMake_libPWG2flowCommon.txt)
+
+include(CMake_libPWG2flowTasks.txt)
 
 include(CMake_libPWG2femtoscopyUser.txt)
 
diff --git a/PWG2/CMake_libPWG2flow.txt b/PWG2/CMake_libPWG2flow.txt
deleted file mode 100644 (file)
index b93d542..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- mode: cmake -*-
-
-set(SRCS
-      FLOW/AliFlowEventSimple.cxx 
-      FLOW/AliFlowTrackSimple.cxx 
-      FLOW/AliFlowTrackSimpleCuts.cxx 
-      FLOW/AliFlowCommonConstants.cxx 
-      FLOW/AliFlowLYZConstants.cxx 
-      FLOW/AliFlowCumuConstants.cxx 
-      FLOW/AliFlowCommonHist.cxx 
-      FLOW/AliFlowCommonHistResults.cxx 
-      FLOW/AliFlowLYZHist1.cxx 
-      FLOW/AliFlowLYZHist2.cxx 
-      FLOW/AliFlowVector.cxx 
-      FLOW/AliFlowLYZEventPlane.cxx 
-      FLOW/AliFlowEventSimpleMaker.cxx 
-      FLOW/AliFlowAnalysisWithScalarProduct.cxx 
-      FLOW/AliFlowAnalysisWithMCEventPlane.cxx 
-      FLOW/AliFlowAnalysisWithLYZEventPlane.cxx 
-      FLOW/AliFlowAnalysisWithLeeYangZeros.cxx 
-      FLOW/AliFlowAnalysisWithCumulants.cxx 
-      FLOW/AliFlowAnalysisWithQCumulants.cxx 
-      FLOW/AliAnalysisTaskScalarProduct.cxx 
-      FLOW/AliAnalysisTaskMCEventPlane.cxx 
-      FLOW/AliAnalysisTaskLYZEventPlane.cxx 
-      FLOW/AliAnalysisTaskCumulants.cxx 
-      FLOW/AliAnalysisTaskQCumulants.cxx 
-      FLOW/AliAnalysisTaskLeeYangZeros.cxx
-      FLOW/AliCumulantsFunctions.cxx
-      FLOW/AliQCumulantsFunctions.cxx
-      FLOW/AliAnalysisTaskFittingQDistribution.cxx
-      FLOW/AliFittingFunctionsForQDistribution.cxx
-      FLOW/AliFittingQDistribution.cxx
-)
-
-# fill list of header files from list of source files
-# by exchanging the file extension
-String(REPLACE ".cxx" ".h" HDRS "${SRCS}")
-
-AddLibrary(PWG2flow "${SRCS}" "${HDRS}")
diff --git a/PWG2/CMake_libPWG2flowCommon.txt b/PWG2/CMake_libPWG2flowCommon.txt
new file mode 100644 (file)
index 0000000..aa7c454
--- /dev/null
@@ -0,0 +1,33 @@
+# -*- mode: cmake -*-
+
+set(SRCS
+      FLOW/AliFlowCommon/AliFlowEventSimple.cxx 
+      FLOW/AliFlowCommon/AliFlowTrackSimple.cxx 
+      FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx 
+      FLOW/AliFlowCommon/AliFlowCommonConstants.cxx 
+      FLOW/AliFlowCommon/AliFlowLYZConstants.cxx 
+      FLOW/AliFlowCommon/AliFlowCumuConstants.cxx 
+      FLOW/AliFlowCommon/AliFlowCommonHist.cxx 
+      FLOW/AliFlowCommon/AliFlowCommonHistResults.cxx 
+      FLOW/AliFlowCommon/AliFlowLYZHist1.cxx 
+      FLOW/AliFlowCommon/AliFlowLYZHist2.cxx 
+      FLOW/AliFlowCommon/AliFlowVector.cxx 
+      FLOW/AliFlowCommon/AliFlowLYZEventPlane.cxx 
+      FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx 
+      FLOW/AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx 
+      FLOW/AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx 
+      FLOW/AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx 
+      FLOW/AliFlowCommon/AliFlowAnalysisWithCumulants.cxx 
+      FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx 
+      FLOW/AliFlowCommon/AliCumulantsFunctions.cxx
+      FLOW/AliFlowCommon/AliQCumulantsFunctions.cxx
+      FLOW/AliFlowCommon/AliAnalysisTaskFittingQDistribution.cxx
+      FLOW/AliFlowCommon/AliFittingFunctionsForQDistribution.cxx
+      FLOW/AliFlowCommon/AliFittingQDistribution.cxx
+)
+
+# fill list of header files from list of source files
+# by exchanging the file extension
+String(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+AddLibrary(PWG2flowCommon "${SRCS}" "${HDRS}")
diff --git a/PWG2/CMake_libPWG2flowTasks.txt b/PWG2/CMake_libPWG2flowTasks.txt
new file mode 100644 (file)
index 0000000..b89ca2a
--- /dev/null
@@ -0,0 +1,17 @@
+# -*- mode: cmake -*-
+
+set(SRCS
+      FLOW/AliFlowEventSimpleMaker.cxx 
+      FLOW/AliAnalysisTaskScalarProduct.cxx 
+      FLOW/AliAnalysisTaskMCEventPlane.cxx 
+      FLOW/AliAnalysisTaskLYZEventPlane.cxx 
+      FLOW/AliAnalysisTaskCumulants.cxx 
+      FLOW/AliAnalysisTaskQCumulants.cxx 
+      FLOW/AliAnalysisTaskLeeYangZeros.cxx
+)
+
+# fill list of header files from list of source files
+# by exchanging the file extension
+String(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+AddLibrary(PWG2flowTasks "${SRCS}" "${HDRS}")
similarity index 90%
rename from PWG2/FLOW/AliFlowLYZConstants.h
rename to PWG2/FLOW/AliFlowCommon/AliFlowLYZConstants.h
index 1cfe32d8ce013ce7631d344cfc38b1ace1e4e64d..c75ca4b71ec6357c75cf3d5b4e56340595b5ae23 100644 (file)
@@ -1,7 +1,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/* $Id$ */
+/* $Id: AliFlowLYZConstants.h 25556 2008-05-02 08:22:51Z snelling $ */
 
 #ifndef ALIFLOWLYZCONSTANTS_H
 #define ALIFLOWLYZCONSTANTS_H
similarity index 97%
rename from PWG2/FLOW/AliFlowLYZHist1.h
rename to PWG2/FLOW/AliFlowCommon/AliFlowLYZHist1.h
index d9dc8e30ab8650ebb6c72ebfff07e3a431808192..66ee244116e464513770dc0e840497d9a6207976 100644 (file)
@@ -1,7 +1,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/* $Id$ */
+/* $Id: AliFlowLYZHist1.h 29627 2008-10-31 10:30:41Z snelling $ */
 
 #ifndef AliFlowLYZHist1_H
 #define AliFlowLYZHist1_H
similarity index 97%
rename from PWG2/FLOW/AliFlowLYZHist2.h
rename to PWG2/FLOW/AliFlowCommon/AliFlowLYZHist2.h
index 60b5c7f0df4e4b4f7372c78abd69e567f2609814..c032c6f6a903ca43659acebb14a010008b67a393 100644 (file)
@@ -1,7 +1,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/* $Id$ */
+/* $Id: AliFlowLYZHist2.h 29627 2008-10-31 10:30:41Z snelling $ */
 
 #ifndef AliFlowLYZHist2_H
 #define AliFlowLYZHist2_H
similarity index 99%
rename from PWG2/FLOW/AliAnalysisTaskCumulants.cxx
rename to PWG2/FLOW/AliFlowTasks/AliAnalysisTaskCumulants.cxx
index d4f5fce025af98063fa536e01bdd96178012081d..acd841f7e6071b3bdad91f8e5fc5a7eca6f6742d 100644 (file)
@@ -48,7 +48,7 @@
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
-#include "../../CORRFW/AliCFManager.h"
+#include "AliCFManager.h"
 
 #include "AliAnalysisTaskCumulants.h"
 #include "AliFlowEventSimpleMaker.h"
similarity index 99%
rename from PWG2/FLOW/AliAnalysisTaskFittingQDistribution.cxx
rename to PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.cxx
index fe3083a7b7bf12d43b6553baa8a7f031a33aa184..8954fc44779b7158d2c8553de112580902d99b85 100644 (file)
@@ -47,7 +47,7 @@
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
-#include "../../CORRFW/AliCFManager.h"
+#include "AliCFManager.h"
 
 #include "AliAnalysisTaskFittingQDistribution.h"
 #include "AliFlowEventSimpleMaker.h"
similarity index 99%
rename from PWG2/FLOW/AliAnalysisTaskLYZEventPlane.cxx
rename to PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx
index 130b3c8203e5b42e2edf25f7a8904b624ca6cb75..b064a00bc86d14a45f6fd271ee1cf1484cb46e79 100644 (file)
@@ -32,7 +32,7 @@ class AliAnalysisTask;
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
-#include "../../CORRFW/AliCFManager.h"
+#include "AliCFManager.h"
 
 #include "AliAnalysisTaskLYZEventPlane.h"
 #include "AliFlowEventSimpleMaker.h"
similarity index 99%
rename from PWG2/FLOW/AliAnalysisTaskLeeYangZeros.cxx
rename to PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx
index dce9cc3c048e887d466e2ca5a622ead2feb4f755..b90394e5baf2a7d2c5d22d5411c37d2286a2efad 100644 (file)
@@ -32,7 +32,7 @@ class AliAnalysisTask;
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
-#include "../../CORRFW/AliCFManager.h"
+#include "AliCFManager.h"
 
 #include "AliFlowLYZConstants.h"   
 #include "AliAnalysisTaskLeeYangZeros.h"
similarity index 99%
rename from PWG2/FLOW/AliAnalysisTaskMCEventPlane.cxx
rename to PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx
index 83829b64b77903e326a2b85a0e0da92b905baca5..0ddf4548d9f811b16c7137c4635cff08e801e85e 100644 (file)
@@ -33,7 +33,7 @@ class AliAnalysisTask;
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
-#include "../../CORRFW/AliCFManager.h"
+#include "AliCFManager.h"
 
 #include "AliGenCocktailEventHeader.h"
 #include "AliGenHijingEventHeader.h"
similarity index 99%
rename from PWG2/FLOW/AliAnalysisTaskQCumulants.cxx
rename to PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx
index c3113be157e608334b5e59e4cf92f1aa31e8136d..58b74d48e21b4c83fbba60c3b5d6512121d5dbdc 100644 (file)
@@ -49,7 +49,7 @@
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
-#include "../../CORRFW/AliCFManager.h"
+#include "AliCFManager.h"
 
 #include "AliAnalysisTaskQCumulants.h"
 #include "AliFlowEventSimpleMaker.h"
similarity index 99%
rename from PWG2/FLOW/AliAnalysisTaskScalarProduct.cxx
rename to PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx
index 17d8e57385a6683f3d3bb59bcd3914a47a4cb31a..25964847e3919eceaba30b997b59c84880acabbb 100644 (file)
@@ -32,7 +32,7 @@ class AliAnalysisTask;
 #include "AliMCEventHandler.h"
 #include "AliMCEvent.h"
 
-#include "../../CORRFW/AliCFManager.h"
+#include "AliCFManager.h"
 
 #include "AliAnalysisTaskScalarProduct.h"
 #include "AliFlowEventSimpleMaker.h"
index 3b949d4423386293c1ce828df5b61ddf6c880a46..d56a7db3e75e2183b17fb21eb6a882d2cf267ed6 100644 (file)
@@ -9,8 +9,8 @@ void CompareFlowResults(TString type="ESD")
   // for AliRoot
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
   gSystem->Load("libANALYSIS.so");
-  gSystem->Load("libPWG2flow.so");
-  cerr<<"libPWG2flow.so loaded ..."<<endl;
+  gSystem->Load("libPWG2flowCommon.so");
+  cerr<<"libPWG2flowCommon.so loaded ..."<<endl;
   
   // for root load histrogram classes
   // output histosgrams
index 3cbc642a5cb92a5dc6d76f959c30d72990bba940..a804a80ff77fb34ce34d4631be6968ec4710ab3c 100755 (executable)
@@ -21,8 +21,8 @@ void makeWeights(TString type="ESD", TString method="GFC", TString cumulantOrder
  //for AliRoot
  gSystem->AddIncludePath("-I$ALICE_ROOT/include");
  gSystem->Load("libANALYSIS.so");
- gSystem->Load("libPWG2flow.so");
- cerr<<"libPWG2flow.so loaded ..."<<endl;
+ gSystem->Load("libPWG2flowCommon.so");
+ cerr<<"libPWG2flowCommon.so loaded ..."<<endl;
 
  //open the output file from the first run of the specified method:
  TString inputFileName = "output";
index d4f8a6316ed07aa6f5e6cbd624d3d4140a49659b..189583be48879b4ce55e6052c1667c80df3f26fe 100644 (file)
@@ -110,8 +110,10 @@ void runAliAnalysisTaskFlow(Int_t nRuns = 4, const Char_t* dataDir="/data/alice2
   cerr<<"libANALYSISRL.so loaded..."<<endl;
   gSystem->Load("libCORRFW.so");
   cerr<<"libCORRFW.so loaded..."<<endl;
-  gSystem->Load("libPWG2flow.so");
-  cerr<<"libPWG2flow.so loaded..."<<endl;
+  gSystem->Load("libPWG2flowCommon.so");
+  cerr<<"libPWG2flowCommon.so loaded..."<<endl;
+  gSystem->Load("libPWG2flowTasks.so");
+  cerr<<"libPWG2flowTasks.so loaded..."<<endl;
 
   // create the TChain. CreateESDChain() is defined in CreateESDChain.C
   if (type!="AOD") { TChain* chain = CreateESDChain(dataDir, nRuns, offset);}
index 94a54ef2089c2771dc5db84691e45caaf2306ce9..2436697dc244a1bd434afbd06da0f2146cfad67c 100644 (file)
@@ -6,13 +6,13 @@
 //--------------------------------------------------------------------------------------
 // RUN SETTINGS
 //flow analysis method can be: (set to kTRUE or kFALSE)
-Bool_t SP    = kFALSE;
-Bool_t LYZ1  = kFALSE;
+Bool_t SP    = kTRUE;
+Bool_t LYZ1  = kTRUE;
 Bool_t LYZ2  = kFALSE;  
 Bool_t LYZEP = kFALSE; 
 Bool_t GFC   = kTRUE;
 Bool_t QC    = kTRUE;
-Bool_t FQD   = kFALSE;
+Bool_t FQD   = kTRUE;
 Bool_t MCEP  = kFALSE; //does not work yet 24/12/08
 //--------------------------------------------------------------------------------------
 
@@ -47,9 +47,9 @@ Bool_t useEtaWeights = kFALSE; //v'(eta) (differential flow in eta)
 
 Int_t offset = 0;
                                           
-int runFlowAnalysis(Int_t aRuns = 44, const char* 
-                                                 dir="/data/alice1/kolk/KineOnly3/")
-                         //dir="/Users/snelling/alice_data/KineOnly3/")
+int runFlowAnalysis(Int_t aRuns = 100, const char* 
+                   //                    dir="/data/alice1/kolk/KineOnly3/")
+                   dir="/Users/snelling/alice_data/KineOnly3/")
 {
   TStopwatch timer;
   timer.Start();
@@ -70,53 +70,55 @@ int runFlowAnalysis(Int_t aRuns = 44, const char*
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
 
   gSystem->Load("libANALYSIS.so");
-  gSystem->Load("libPWG2flow.so");
-  cerr<<"libPWG2flow.so loaded ..."<<endl;
+  gSystem->Load("libPWG2flowCommon.so");
+  cerr<<"libPWG2flowCommon.so loaded ..."<<endl;
+  gSystem->Load("libPWG2flowTasks.so");
+  cerr<<"libPWG2flowTasks.so loaded ..."<<endl;
   cout<<endl; 
   
-  // flow event in AliRoot
+  // Flow event in AliRoot
   AliFlowEventSimpleMaker* fEventMaker = new AliFlowEventSimpleMaker();
    
   // In root
 
   /*    
-  // constants  
-  gROOT->LoadMacro("code/AliFlowCommonConstants.cxx+");
-  gROOT->LoadMacro("code/AliFlowLYZConstants.cxx+");
-  gROOT->LoadMacro("code/AliFlowCumuConstants.cxx+");
+  // Constants  
+  gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
 
-  // flow event
-  gROOT->LoadMacro("code/AliFlowVector.cxx+"); 
-  gROOT->LoadMacro("code/AliFlowTrackSimple.cxx+");    
-  gROOT->LoadMacro("code/AliFlowEventSimple.cxx+");
+  // Flow event
+  gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
+  gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
+  gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
 
-  // cuts
-  gROOT->LoadMacro("code/AliFlowTrackSimpleCuts.cxx+");    
+  // Cuts
+  gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
 
-  // output histosgrams
-  gROOT->LoadMacro("code/AliFlowCommonHist.cxx+");
-  gROOT->LoadMacro("code/AliFlowCommonHistResults.cxx+");
-  gROOT->LoadMacro("code/AliFlowLYZHist1.cxx+");
-  gROOT->LoadMacro("code/AliFlowLYZHist2.cxx+");
+  // Output histosgrams
+  gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist1.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowLYZHist2.cxx+");
 
-  // functions needed for various methods
-  gROOT->LoadMacro("code/AliCumulantsFunctions.cxx+");
-  gROOT->LoadMacro("code/AliQCumulantsFunctions.cxx+");
-  gROOT->LoadMacro("code/AliFittingFunctionsForQDistribution.cxx+");
-  gROOT->LoadMacro("code/AliFlowLYZEventPlane.cxx+");
+  // Functions needed for various methods
+  gROOT->LoadMacro("AliFlowCommon/AliCumulantsFunctions.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliQCumulantsFunctions.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFittingFunctionsForQDistribution.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowLYZEventPlane.cxx+");
 
   // Flow Analysis code for various methods
-  gROOT->LoadMacro("code/AliFlowAnalysisWithMCEventPlane.cxx+"); 
-  gROOT->LoadMacro("code/AliFlowAnalysisWithScalarProduct.cxx+");
-  gROOT->LoadMacro("code/AliFlowAnalysisWithLYZEventPlane.cxx+");
-  gROOT->LoadMacro("code/AliFlowAnalysisWithLeeYangZeros.cxx+");
-  gROOT->LoadMacro("code/AliFlowAnalysisWithCumulants.cxx+");
-  gROOT->LoadMacro("code/AliFlowAnalysisWithQCumulants.cxx+"); 
-  gROOT->LoadMacro("code/AliFittingQDistribution.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx+"); 
+  gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithCumulants.cxx+");
+  gROOT->LoadMacro("AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx+"); 
+  gROOT->LoadMacro("AliFlowCommon/AliFittingQDistribution.cxx+");
 
   // Class to fill the FlowEvent without aliroot dependence
-  // can be found in the directory other
-  gROOT->LoadMacro("code/FlowEventSimpleMaker.cxx+");   
+  // can be found in the directory FlowEventMakers
+  gROOT->LoadMacro("FlowEventMakers/FlowEventSimpleMaker.cxx+");   
 
   cout << "finished loading macros!" << endl;  
 
index 9b32bd93464da85f8ddc9ee9f243bbe700888cdd..3d0022491b1463a207909fc9322f0ac51b18cb9c 100644 (file)
@@ -76,7 +76,7 @@ const Int_t maxnsigmatovertex2 = 3;
 
 //WEIGHTS SETTINGS: 
 //to use or not to use the weights - that is a question!
-Bool_t usePhiWeights = kTRUE; //Phi
+Bool_t usePhiWeights = kFALSE; //Phi
 Bool_t usePtWeights  = kFALSE; //v'(pt)
 Bool_t useEtaWeights = kFALSE; //v'(eta)
 Bool_t useWeights = usePhiWeights||usePtWeights||usePtWeights;
@@ -114,8 +114,8 @@ void runProofFlow(const Char_t* data="/PWG2/akisiel/Therminator_midcentral_ESD",
   //  TProof::Mgr("alicecaf")->SetROOTVersion("v5-21-01-alice");
   
   printf("*** Connect to PROOF ***\n");
-  TProof::Open("abilandz@alicecaf.cern.ch");
-  //TProof::Open("snelling@localhost");
+  //  TProof::Open("abilandz@alicecaf.cern.ch");
+  TProof::Open("snelling@localhost");
  
   //gProof->UploadPackage("AF-v4-15"); 
   //gProof->EnablePackage("AF-v4-15");
@@ -133,9 +133,12 @@ void runProofFlow(const Char_t* data="/PWG2/akisiel/Therminator_midcentral_ESD",
   gProof->EnablePackage("PWG2AOD");
   gProof->UploadPackage("CORRFW.par");
   gProof->EnablePackage("CORRFW");
-  gProof->ClearPackage("PWG2flow");
-  gProof->UploadPackage("PWG2flow.par");
-  gProof->EnablePackage("PWG2flow");
+  gProof->ClearPackage("PWG2flowCommon");
+  gProof->UploadPackage("PWG2flowCommon.par");
+  gProof->EnablePackage("PWG2flowCommon");
+  gProof->ClearPackage("PWG2flowTasks");
+  gProof->UploadPackage("PWG2flowTasks.par");
+  gProof->EnablePackage("PWG2flowTasks");
   
   
   //____________________________________________//
index 1501755ef6291b05f315eed6eb483dc05e9ed168..0b78b509bbf526394869efcc4ed84d4c999f9d8b 100644 (file)
@@ -41,6 +41,14 @@ ifneq ($(PWG2femtoscopy_INCLUDE),)
   ALICEINC += -I../$(PWG2femtoscopy_INCLUDE)
 endif
 
+ifneq ($(PWG2flowCommon_INCLUDE),)
+  ALICEINC += -I../$(PWG2flowCommon_INCLUDE)
+endif
+
+ifneq ($(PWG2flowTasks_INCLUDE),)
+  ALICEINC += -I../$(PWG2flowTasks_INCLUDE)
+endif
+
 ifneq ($(PWG2resonances_INCLUDE),)
   ALICEINC += -I../$(PWG2resonances_INCLUDE)
 endif
index 8220f95f873003ff39a2721b5578708ea387701c..1048a267724767229f541cf84a89e68bd93d81b5 100755 (executable)
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 touch libPWG2ebye.pkg
-touch libPWG2flow.pkg
+touch libPWG2flowCommon.pkg
+touch libPWG2flowTasks.pkg
 
 make libPWG2.so
diff --git a/PWG2/PROOF-INF.PWG2flow/BUILD.sh b/PWG2/PROOF-INF.PWG2flow/BUILD.sh
deleted file mode 100755 (executable)
index 16f288b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-touch libPWG2flow.pkg
-
-make libPWG2flow.so
diff --git a/PWG2/PROOF-INF.PWG2flow/SETUP.C b/PWG2/PROOF-INF.PWG2flow/SETUP.C
deleted file mode 100644 (file)
index cf7c80e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-void SETUP() {
-  CheckLoadLibrary("libPWG2flow");
-  
-  // Set the include paths
-  gROOT->ProcessLine(".include PWG2flow/FLOW");
-
-  // Set our location, so that other packages can find us
-  gSystem->Setenv("PWG2flow_INCLUDE", "PWG2flow/FLOW");
-}
-
-Int_t CheckLoadLibrary(const char* library) {
-  // checks if a library is already loaded, if not loads the library
-
-  if (strlen(gSystem->GetLibraries(Form("%s.so", library), "", kFALSE)) > 0)
-    return 1;
-  
-  return gSystem->Load(library);
-}
diff --git a/PWG2/PROOF-INF.PWG2flowCommon/BUILD.sh b/PWG2/PROOF-INF.PWG2flowCommon/BUILD.sh
new file mode 100755 (executable)
index 0000000..4ee8e84
--- /dev/null
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+touch libPWG2flowCommon.pkg
+
+make libPWG2flowCommon.so
diff --git a/PWG2/PROOF-INF.PWG2flowCommon/SETUP.C b/PWG2/PROOF-INF.PWG2flowCommon/SETUP.C
new file mode 100644 (file)
index 0000000..eb9113e
--- /dev/null
@@ -0,0 +1,10 @@
+void SETUP() {
+  gSystem->Load("libPWG2flowCommon");
+  
+  // Set the include paths
+  gROOT->ProcessLine(".include PWG2flowCommon/FLOW/AliFlowCommon");
+
+  // Set our location, so that other packages can find us
+  gSystem->Setenv("PWG2flowCommon_INCLUDE", "PWG2flowCommon/FLOW/AliFlowCommon");
+}
+
diff --git a/PWG2/PROOF-INF.PWG2flowTasks/BUILD.sh b/PWG2/PROOF-INF.PWG2flowTasks/BUILD.sh
new file mode 100755 (executable)
index 0000000..8cf538a
--- /dev/null
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+touch libPWG2flowTasks.pkg
+
+make libPWG2flowTasks.so
diff --git a/PWG2/PROOF-INF.PWG2flowTasks/SETUP.C b/PWG2/PROOF-INF.PWG2flowTasks/SETUP.C
new file mode 100644 (file)
index 0000000..442fb08
--- /dev/null
@@ -0,0 +1,10 @@
+void SETUP() {
+  gSystem->Load("libPWG2flowTasks");
+  
+  // Set the include paths
+  gROOT->ProcessLine(".include PWG2flowTasks/FLOW/AliFlowTasks");
+
+  // Set our location, so that other packages can find us
+  gSystem->Setenv("PWG2flowTasks_INCLUDE", "PWG2flowTasks/FLOW/AliFlowTasks");
+}
+
similarity index 73%
rename from PWG2/PWG2flowLinkDef.h
rename to PWG2/PWG2flowCommonLinkDef.h
index 7b006b73b644c207de3331d51f72dd9433208b9f..3c5e56bade4811df6ae6a19f02d17d111f0eaf97 100644 (file)
@@ -8,32 +8,28 @@
 #pragma link C++ namespace AliFlowLYZConstants;
 #pragma link C++ namespace AliFlowCumuConstants;
 
-#pragma link C++ class AliFlowEventSimple+;
+#pragma link C++ class AliFlowVector+;
 #pragma link C++ class AliFlowTrackSimple+;
+#pragma link C++ class AliFlowEventSimple+;
+
 #pragma link C++ class AliFlowTrackSimpleCuts+;
+
 #pragma link C++ class AliFlowCommonHist+;
 #pragma link C++ class AliFlowCommonHistResults+;
 #pragma link C++ class AliFlowLYZHist1+;
 #pragma link C++ class AliFlowLYZHist2+;
-#pragma link C++ class AliFlowVector+;
+
+#pragma link C++ class AliCumulantsFunctions+;
+#pragma link C++ class AliQCumulantsFunctions+;
+#pragma link C++ class AliFittingFunctionsForQDistribution+;
 #pragma link C++ class AliFlowLYZEventPlane+;
-#pragma link C++ class AliFlowEventSimpleMaker+;
+
 #pragma link C++ class AliFlowAnalysisWithMCEventPlane+;
 #pragma link C++ class AliFlowAnalysisWithScalarProduct+;
 #pragma link C++ class AliFlowAnalysisWithLYZEventPlane+;
 #pragma link C++ class AliFlowAnalysisWithLeeYangZeros+;
 #pragma link C++ class AliFlowAnalysisWithCumulants+;
 #pragma link C++ class AliFlowAnalysisWithQCumulants+;
-#pragma link C++ class AliAnalysisTaskScalarProduct+;
-#pragma link C++ class AliAnalysisTaskMCEventPlane+;
-#pragma link C++ class AliAnalysisTaskLYZEventPlane+;
-#pragma link C++ class AliAnalysisTaskLeeYangZeros+;
-#pragma link C++ class AliAnalysisTaskCumulants+;
-#pragma link C++ class AliAnalysisTaskQCumulants+;
-#pragma link C++ class AliCumulantsFunctions+;
-#pragma link C++ class AliQCumulantsFunctions+;
-#pragma link C++ class AliFittingFunctionsForQDistribution+;
-#pragma link C++ class AliAnalysisTaskFittingQDistribution+;
 #pragma link C++ class AliFittingQDistribution+;
 
 #endif
diff --git a/PWG2/PWG2flowTasksLinkDef.h b/PWG2/PWG2flowTasksLinkDef.h
new file mode 100644 (file)
index 0000000..ee51eb6
--- /dev/null
@@ -0,0 +1,18 @@
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AliFlowEventSimpleMaker+;
+
+#pragma link C++ class AliAnalysisTaskScalarProduct+;
+#pragma link C++ class AliAnalysisTaskMCEventPlane+;
+#pragma link C++ class AliAnalysisTaskLYZEventPlane+;
+#pragma link C++ class AliAnalysisTaskLeeYangZeros+;
+#pragma link C++ class AliAnalysisTaskCumulants+;
+#pragma link C++ class AliAnalysisTaskQCumulants+;
+#pragma link C++ class AliAnalysisTaskFittingQDistribution+;
+
+
+#endif
diff --git a/PWG2/libPWG2flow.pkg b/PWG2/libPWG2flow.pkg
deleted file mode 100644 (file)
index 87b02eb..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#-*- Mode: Makefile -*-
-
-SRCS= FLOW/AliFlowEventSimple.cxx \
-      FLOW/AliFlowTrackSimple.cxx \
-      FLOW/AliFlowTrackSimpleCuts.cxx \
-      FLOW/AliFlowVector.cxx \
-      FLOW/AliFlowCommonConstants.cxx \
-      FLOW/AliFlowLYZConstants.cxx \
-      FLOW/AliFlowCumuConstants.cxx \
-      FLOW/AliFlowCommonHist.cxx \
-      FLOW/AliFlowCommonHistResults.cxx \
-      FLOW/AliFlowLYZHist1.cxx \
-      FLOW/AliFlowLYZHist2.cxx \
-      FLOW/AliFlowLYZEventPlane.cxx \
-      FLOW/AliFlowEventSimpleMaker.cxx \
-      FLOW/AliFlowAnalysisWithScalarProduct.cxx \
-      FLOW/AliFlowAnalysisWithMCEventPlane.cxx \
-      FLOW/AliFlowAnalysisWithLYZEventPlane.cxx \
-      FLOW/AliFlowAnalysisWithLeeYangZeros.cxx \
-      FLOW/AliFlowAnalysisWithCumulants.cxx \
-      FLOW/AliFlowAnalysisWithQCumulants.cxx \
-      FLOW/AliFittingQDistribution.cxx \
-      FLOW/AliCumulantsFunctions.cxx \
-      FLOW/AliQCumulantsFunctions.cxx \
-      FLOW/AliFittingFunctionsForQDistribution.cxx \
-      FLOW/AliAnalysisTaskScalarProduct.cxx \
-      FLOW/AliAnalysisTaskMCEventPlane.cxx \
-      FLOW/AliAnalysisTaskLYZEventPlane.cxx \
-      FLOW/AliAnalysisTaskCumulants.cxx \
-      FLOW/AliAnalysisTaskQCumulants.cxx \
-      FLOW/AliAnalysisTaskLeeYangZeros.cxx \
-      FLOW/AliAnalysisTaskFittingQDistribution.cxx
-
-HDRS= $(SRCS:.cxx=.h) 
-
-DHDR:=PWG2flowLinkDef.h
-
-EXPORT:=
-
-EINCLUDE:= 
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
-                         -lESD -lAOD -lPWG2AOD -lANALYSIS -lANALYSISalice \
-                         -lCORRFW \
-                         -L$(shell root-config --libdir) -lEG
-endif
diff --git a/PWG2/libPWG2flowCommon.pkg b/PWG2/libPWG2flowCommon.pkg
new file mode 100644 (file)
index 0000000..25497bb
--- /dev/null
@@ -0,0 +1,36 @@
+#-*- Mode: Makefile -*-
+
+SRCS= FLOW/AliFlowCommon/AliFlowEventSimple.cxx \
+      FLOW/AliFlowCommon/AliFlowTrackSimple.cxx \
+      FLOW/AliFlowCommon/AliFlowTrackSimpleCuts.cxx \
+      FLOW/AliFlowCommon/AliFlowVector.cxx \
+      FLOW/AliFlowCommon/AliFlowCommonConstants.cxx \
+      FLOW/AliFlowCommon/AliFlowLYZConstants.cxx \
+      FLOW/AliFlowCommon/AliFlowCumuConstants.cxx \
+      FLOW/AliFlowCommon/AliFlowCommonHist.cxx \
+      FLOW/AliFlowCommon/AliFlowCommonHistResults.cxx \
+      FLOW/AliFlowCommon/AliFlowLYZHist1.cxx \
+      FLOW/AliFlowCommon/AliFlowLYZHist2.cxx \
+      FLOW/AliFlowCommon/AliFlowLYZEventPlane.cxx \
+      FLOW/AliFlowCommon/AliFlowAnalysisWithScalarProduct.cxx \
+      FLOW/AliFlowCommon/AliFlowAnalysisWithMCEventPlane.cxx \
+      FLOW/AliFlowCommon/AliFlowAnalysisWithLYZEventPlane.cxx \
+      FLOW/AliFlowCommon/AliFlowAnalysisWithLeeYangZeros.cxx \
+      FLOW/AliFlowCommon/AliFlowAnalysisWithCumulants.cxx \
+      FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx \
+      FLOW/AliFlowCommon/AliFittingQDistribution.cxx \
+      FLOW/AliFlowCommon/AliCumulantsFunctions.cxx \
+      FLOW/AliFlowCommon/AliQCumulantsFunctions.cxx \
+      FLOW/AliFlowCommon/AliFittingFunctionsForQDistribution.cxx
+
+HDRS= $(SRCS:.cxx=.h) 
+
+DHDR:=PWG2flowCommonLinkDef.h
+
+EXPORT:=
+
+EINCLUDE:= 
+
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(shell root-config --libdir) -lEG
+endif
diff --git a/PWG2/libPWG2flowTasks.pkg b/PWG2/libPWG2flowTasks.pkg
new file mode 100644 (file)
index 0000000..df38e83
--- /dev/null
@@ -0,0 +1,25 @@
+#-*- Mode: Makefile -*-
+
+SRCS= FLOW/AliFlowTasks/AliFlowEventSimpleMaker.cxx \
+      FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx \
+      FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx \
+      FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx \
+      FLOW/AliFlowTasks/AliAnalysisTaskCumulants.cxx \
+      FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx \
+      FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx \
+      FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.cxx
+
+HDRS= $(SRCS:.cxx=.h) 
+
+DHDR:=PWG2flowTasksLinkDef.h
+
+EXPORT:=
+
+EINCLUDE:= PWG2/FLOW/AliFlowCommon 
+
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
+                         -lESD -lAOD -lPWG2AOD -lANALYSIS -lANALYSISalice \
+                         -lCORRFW \
+                         -L$(shell root-config --libdir) -lEG
+endif