have unique histogram names when using multiple instances of this method

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
index 71da5900332eefd00f6389983b1da128223d4fff..a78e48a4191c76c27238332044f516208d032f78 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
@@ -94,6 +94,7 @@ AliFlowAnalysisWithQCumulants::AliFlowAnalysisWithQCumulants():
  fEtaMax(0),
  fEtaBinWidth(0),
  fHarmonic(2),
+ fAnalysisLabel(NULL),
  // 2.) weights:
  fWeightsList(NULL),
  fUsePhiWeights(kFALSE),
@@ -147,6 +148,9 @@ AliFlowAnalysisWithQCumulants::AliFlowAnalysisWithQCumulants():
   fWeightsList->SetName("Weights");
   fWeightsList->SetOwner(kTRUE);
     
+  // analysis label;
+  fAnalysisLabel = new TString();
+      
   // initialize all arrays:  
   this->InitializeArraysForIntFlow();
   this->InitializeArraysForDiffFlow();
@@ -1739,11 +1743,11 @@ void AliFlowAnalysisWithQCumulants::GetOutputHistograms(TList *outputListHistos)
   
   // nested list in the list of profiles fDiffFlowListProfiles "Profiles":
   TList *dfpType[2] = {NULL};
-  TList *dfpParticleWeights[2][2] = {NULL};
-  TList *dfpEventWeights[2][2][2] = {NULL};
-  TList *diffFlowCorrelations[2][2][2] = {NULL};
-  TList *diffFlowProductsOfCorrelations[2][2][2] = {NULL};
-  TList *diffFlowCorrectionTerms[2][2][2][2] = {NULL};
+  TList *dfpParticleWeights[2][2] = {{NULL}};
+  TList *dfpEventWeights[2][2][2] = {{{NULL}}};
+  TList *diffFlowCorrelations[2][2][2] = {{{NULL}}};
+  TList *diffFlowProductsOfCorrelations[2][2][2] = {{{NULL}}};
+  TList *diffFlowCorrectionTerms[2][2][2][2] = {{{{NULL}}}};
   
   if(diffFlowListProfiles)
   {
@@ -1798,9 +1802,9 @@ void AliFlowAnalysisWithQCumulants::GetOutputHistograms(TList *outputListHistos)
      cout<<"WARNING: diffFlowListProfiles is NULL in AFAWQC::GOH() !!!!"<<endl;
     }  
   
-  TProfile2D *correlationsPro[2][2][2][4] = {NULL};
-  TProfile2D *productsOfCorrelationsPro[2][2][2][5] = {NULL};
-  TProfile2D *correctionTermsPro[2][2][2][2][2] = {NULL};
+  TProfile2D *correlationsPro[2][2][2][4] = {{{{NULL}}}};
+  TProfile2D *productsOfCorrelationsPro[2][2][2][5] = {{{{NULL}}}};
+  TProfile2D *correctionTermsPro[2][2][2][2][2] = {{{{{NULL}}}}};
   
   TString correlationName[4] = {"<2'>","<4'>","<6'>","<8'>"};
   TString cumulantName[4] = {"QC{2'}","QC{4'}","QC{6'}","QC{8'}"};
@@ -1922,14 +1926,14 @@ void AliFlowAnalysisWithQCumulants::GetOutputHistograms(TList *outputListHistos)
   
   // nested list in the list of results fDiffFlowListResults "Results":
   TList *dfrType[2] = {NULL};
-  TList *dfrParticleWeights[2][2] = {NULL};
-  TList *dfrEventWeights[2][2][2] = {NULL};
-  TList *dfrCorrections[2][2][2][2] = {NULL}; 
-  TList *diffFlowFinalCorrelations[2][2][2] = {NULL}; 
-  TList *diffFlowFinalCorrections[2][2][2] = {NULL}; 
-  TList *diffFlowFinalCovariances[2][2][2] = {NULL};   
-  TList *diffFlowFinalCumulants[2][2][2][2] = {NULL};  
-  TList *diffFlowFinalFlow[2][2][2][2] = {NULL}; 
+  TList *dfrParticleWeights[2][2] = {{NULL}};
+  TList *dfrEventWeights[2][2][2] = {{{NULL}}};
+  TList *dfrCorrections[2][2][2][2] = {{{{NULL}}}}; 
+  TList *diffFlowFinalCorrelations[2][2][2] = {{{NULL}}}; 
+  TList *diffFlowFinalCorrections[2][2][2] = {{{NULL}}}; 
+  TList *diffFlowFinalCovariances[2][2][2] = {{{NULL}}};   
+  TList *diffFlowFinalCumulants[2][2][2][2] = {{{{NULL}}}};  
+  TList *diffFlowFinalFlow[2][2][2][2] = {{{{NULL}}}}; 
  
   if(diffFlowListResults)
   {
@@ -1993,20 +1997,20 @@ void AliFlowAnalysisWithQCumulants::GetOutputHistograms(TList *outputListHistos)
      cout<<"WARNING: diffFlowListResults is NULL in AFAWQC::GOH() !!!!"<<endl;
     }
  
- TH2D *finalCorrelations2D[2][2][2][4] = {NULL};
- TH1D *finalCorrelations1D[2][2][2][2][4] = {NULL}; 
- TH2D *finalCumulants2D[2][2][2][2][4] = {NULL};
- TH1D *finalCumulantsPt[2][2][2][2][4] = {NULL}; 
- TH1D *finalCumulantsEta[2][2][2][2][4] = {NULL}; 
- TH2D *finalCorrections2D[2][2][2][4] = {NULL};
- TH1D *finalCorrections1D[2][2][2][2][4] = {NULL}; 
- TH2D *finalCovariances2D[2][2][2][4] = {NULL};
- TH1D *finalCovariances1D[2][2][2][2][4] = {NULL}; 
- TH2D *finalFlow2D[2][2][2][2][4] = {NULL};
- TH1D *finalFlowPt[2][2][2][2][4] = {NULL}; 
- TH1D *finalFlowEta[2][2][2][2][4] = {NULL}; 
+ TH2D *finalCorrelations2D[2][2][2][4] = {{{{NULL}}}};
+ TH1D *finalCorrelations1D[2][2][2][2][4] = {{{{{NULL}}}}}; 
+ TH2D *finalCumulants2D[2][2][2][2][4] = {{{{{NULL}}}}};
+ TH1D *finalCumulantsPt[2][2][2][2][4] = {{{{{NULL}}}}}; 
+ TH1D *finalCumulantsEta[2][2][2][2][4] = {{{{{NULL}}}}}; 
+ TH2D *finalCorrections2D[2][2][2][4] = {{{{NULL}}}};
+ TH1D *finalCorrections1D[2][2][2][2][4] = {{{{{NULL}}}}}; 
+ TH2D *finalCovariances2D[2][2][2][4] = {{{{NULL}}}};
+ TH1D *finalCovariances1D[2][2][2][2][4] = {{{{{NULL}}}}}; 
+ TH2D *finalFlow2D[2][2][2][2][4] = {{{{{NULL}}}}};
+ TH1D *finalFlowPt[2][2][2][2][4] = {{{{{NULL}}}}}; 
+ TH1D *finalFlowEta[2][2][2][2][4] = {{{{{NULL}}}}}; 
  TH2D *nonEmptyBins2D[2] = {NULL};
- TH1D *nonEmptyBins1D[2][2] = {NULL};
+ TH1D *nonEmptyBins1D[2][2] = {{NULL}};
  
  for(Int_t t=0;t<2;t++)
  {

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
index 48d35fe26e0f562606861789e81d9aa96d147457..c880a6095e27711c26d8419086985f586349a028 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
@@ -125,6 +125,8 @@ class AliFlowAnalysisWithQCumulants{
   AliFlowCommonHistResults* GetCommonHistsResults8th() const {return this->fCommonHistsResults8th;};
   void SetHarmonic(Int_t const harmonic) {this->fHarmonic = harmonic;};
   Int_t GetHarmonic() const {return this->fHarmonic;};
+  void SetAnalysisLabel(const char *aLabel) {this->fAnalysisLabel->Append(*aLabel);};
+  TString *GetAnalysisLabel() const {return this->fAnalysisLabel;};
   
   // 2.) weights:
   void SetWeightsList(TList* wlist) {this->fWeightsList = wlist;}
@@ -274,6 +276,7 @@ class AliFlowAnalysisWithQCumulants{
   Double_t fEtaMax; // maximum eta
   Double_t fEtaBinWidth; // bin width for eta histograms  
   Int_t fHarmonic; // harmonic 
+  TString *fAnalysisLabel; // analysis label (all histograms and output file will have this label)
   
   // 2.) weights
   TList *fWeightsList; // list to hold all histograms with particle weights: fUseParticleWeights, fPhiWeights, fPtWeights and fEtaWeights