updated streamer version and macros cleaned up for removed class

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h b/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h
index 71a8540fcb84fa97217973b0df3179d84424f9cc..aa19e9a09b0e8cfd0fcb7e1ebed702ca39682bb2 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h
@@ -99,7 +99,7 @@ class AliFlowCommonHist: public TNamed {
 
   TList*    fHistList;            //list to hold all histograms  
 
-  ClassDef(AliFlowCommonHist,1)  // macro for rootcint
+  ClassDef(AliFlowCommonHist,2)  // macro for rootcint
 };
 #endif
 

diff --git a/PWG2/FLOW/macros/compareFlowResults.C b/PWG2/FLOW/macros/compareFlowResults.C
index e4590584b6ea0ccdb27ece85eb9fa7f4fa3b51c5..331f1dc8e7c77ea2366a95172b0ceecf6214e3e9 100644 (file)
--- a/PWG2/FLOW/macros/compareFlowResults.C
+++ b/PWG2/FLOW/macros/compareFlowResults.C
@@ -1460,16 +1460,12 @@ void LoadLibrariesCFR(const libModes analysisMode) {
    // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
     
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEvent.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
     
     // Output histosgrams
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");

diff --git a/PWG2/FLOW/macros/fqd.C b/PWG2/FLOW/macros/fqd.C
index a218a30dc9d377ce510aaa8d50831013c4c3638e..23eeac59cf7d08f414d5fb0ba8e476d329c5a6f2 100644 (file)
--- a/PWG2/FLOW/macros/fqd.C
+++ b/PWG2/FLOW/macros/fqd.C
@@ -268,15 +268,12 @@ void LoadLibrariesFQD(const libModes mode) {
     // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
     
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
     
     // Output histosgrams
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");

diff --git a/PWG2/FLOW/macros/makeWeights.C b/PWG2/FLOW/macros/makeWeights.C
index 04353e4bf36b3fb4a765e7acf1fb696653f36b9e..facdc4a6c8ff3ff1e8aca8ff0c66931c262778a8 100755 (executable)
--- a/PWG2/FLOW/macros/makeWeights.C
+++ b/PWG2/FLOW/macros/makeWeights.C
@@ -388,16 +388,12 @@ void LoadLibrariesMW(const libModes mode) {
    // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
     
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEvent.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
+    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
     
     // Output histosgrams
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");

diff --git a/PWG2/FLOW/macros/mergeOutput.C b/PWG2/FLOW/macros/mergeOutput.C
index c9a127b1bba737d4bab073d7e6afdad61bd5bdc5..3419e383bd9b8c04c6c56800a4629e4446514e3e 100644 (file)
--- a/PWG2/FLOW/macros/mergeOutput.C
+++ b/PWG2/FLOW/macros/mergeOutput.C
@@ -197,16 +197,12 @@ void LoadLibrariesMO(const libModes mode) {
     // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
     
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEvent.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
+    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
     
     // Output histosgrams
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");

diff --git a/PWG2/FLOW/macros/redoFinish.C b/PWG2/FLOW/macros/redoFinish.C
index f8b1f0d30336c9d3dc693605710ec49b2c623ecc..b87ded7b09ac80c07e2c919ab053ccf80b0d4e54 100644 (file)
--- a/PWG2/FLOW/macros/redoFinish.C
+++ b/PWG2/FLOW/macros/redoFinish.C
@@ -248,17 +248,13 @@ void LoadLibrariesRF(const libModes mode) {
     // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
     
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEvent.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
+    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+        
     // Output histograms
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");

diff --git a/PWG2/FLOW/macros/runFlowAnalysis.C b/PWG2/FLOW/macros/runFlowAnalysis.C
index c760cdb19a89c793098ee7cd7aa2d508f8dd7a44..f818ed3773d7fb6852ee7d317e41578b76a5cc40 100644 (file)
--- a/PWG2/FLOW/macros/runFlowAnalysis.C
+++ b/PWG2/FLOW/macros/runFlowAnalysis.C
@@ -607,17 +607,13 @@ void LoadLibraries(const anaModes mode) {
     // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
     
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEvent.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
+    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+      
     // Output histosgrams
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");

diff --git a/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C b/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C
index 6e25872b2e691c272c4832d3632a1c29326ac3ff..89bcea77d2ae0dc1acc0704fbcd2c94f1f801141 100644 (file)
--- a/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C
+++ b/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C
@@ -800,16 +800,12 @@ void LoadLibraries(const anaModes mode) {
     // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
     
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEvent.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
+    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
     
     // Output histosgrams
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");

diff --git a/PWG2/FLOW/macros/showSpread.C b/PWG2/FLOW/macros/showSpread.C
index 418f21c4a68817ad8151914316c587d278239489..4fb0f8a4542e7261607d876152e5e30e981d46d4 100644 (file)
--- a/PWG2/FLOW/macros/showSpread.C
+++ b/PWG2/FLOW/macros/showSpread.C
@@ -452,17 +452,13 @@ void LoadLibrariesSS(const libModes mode) {
     // Constants  
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonConstants.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowLYZConstants.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowCumuConstants.cxx+");
-    
+        
     // Flow event
     gROOT->LoadMacro("AliFlowCommon/AliFlowVector.cxx+"); 
-    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEvent.cxx+");
-    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
-    
-    // Cuts
+    gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimple.cxx+");    
     gROOT->LoadMacro("AliFlowCommon/AliFlowTrackSimpleCuts.cxx+");    
-    
+    gROOT->LoadMacro("AliFlowCommon/AliFlowEventSimple.cxx+");
+        
     // Output histograms
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHist.cxx+");
     gROOT->LoadMacro("AliFlowCommon/AliFlowCommonHistResults.cxx+");