]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
correction for non-uniform acceptance for 2nd and 4th order differential flow
[u/mrichter/AliRoot.git] / PWG2 / FLOW / AliFlowCommon / AliFlowAnalysisWithQCumulants.h
index decb3e4801fcdff6f7e4b58f492a2b6a632097cf..b525f6f8d05cf3130cc103d74bc7fa19e621487c 100644 (file)
@@ -29,7 +29,6 @@ class TProfile;
 class TProfile2D;
 
 class AliFlowEventSimple;
-class AliFlowTrackSimple;
 class AliFlowVector;
 
 class AliFlowCommonHist;
@@ -41,615 +40,407 @@ class AliFlowAnalysisWithQCumulants{
  public:
   AliFlowAnalysisWithQCumulants();
   virtual ~AliFlowAnalysisWithQCumulants(); 
-  
+  // 0.) methods called in the constructor:
+  virtual void InitializeArraysForIntFlow();
+  virtual void InitializeArraysForDiffFlow();
+  virtual void InitializeArraysForDistributions();
+  virtual void InitializeArraysForNestedLoops();
+  // 1.) method Init() and methods called within Init():
   virtual void Init();
-  virtual void Make(AliFlowEventSimple* anEvent);
-  
-  virtual void CalculateCorrelationsForIntegratedFlow(); // everything cross-checked (2-8)
-  virtual void CalculateWeightedCorrelationsForIntegratedFlow();
-  virtual void CalculateCorrelationsForDifferentialFlow(TString type="POI");
-  virtual void CalculateWeightedCorrelationsForDifferentialFlow(TString type="POI");
-  
-  virtual void EvaluateNestedLoopsForIntegratedFlow(AliFlowEventSimple* anEvent); 
-  virtual void EvaluateNestedLoopsForDifferentialFlow(AliFlowEventSimple* anEvent); 
-  
+    virtual void AccessConstants();
+    virtual void BookAndNestAllLists();
+    virtual void BookCommonHistograms();
+    virtual void BookAndFillWeightsHistograms();
+    virtual void BookEverythingForIntegratedFlow();
+    virtual void BookEverythingForDifferentialFlow();
+    virtual void BookEverythingForDistributions();  
+    virtual void BookEverythingForNestedLoops();   
+    virtual void StoreIntFlowFlags();
+    virtual void StoreDiffFlowFlags();
+    virtual void StoreHarmonic();
+  // 2.) method Make() and methods called within Make():
+  virtual void Make(AliFlowEventSimple *anEvent);
+    // 2a.) common:
+    virtual void FillAverageMultiplicities(Int_t nRP);
+    virtual void FillCommonControlHistograms(AliFlowEventSimple *anEvent);
+    virtual void ResetEventByEventQuantities();
+    // 2b.) integrated flow:
+    virtual void CalculateIntFlowCorrelations(); 
+    virtual void CalculateIntFlowProductOfCorrelations();
+    virtual void CalculateIntFlowSumOfEventWeights();
+    virtual void CalculateIntFlowSumOfProductOfEventWeights();
+    virtual void CalculateIntFlowCorrectionsForNUASinTerms();  
+    virtual void CalculateIntFlowCorrectionsForNUACosTerms();
+    // ...  
+    virtual void CalculateIntFlowCorrelationsUsingParticleWeights();
+    virtual void CalculateWeightedQProductsForIntFlow();
+    virtual void EvaluateIntFlowCorrelationsWithNestedLoops(AliFlowEventSimple* anEvent); 
+    virtual void EvaluateIntFlowCorrelationsWithNestedLoopsUsingParticleWeights(AliFlowEventSimple* anEvent); 
+    virtual void EvaluateIntFlowCorrectionsForNUAWithNestedLoops(AliFlowEventSimple* anEvent);  
+    // 2c.) differential flow:
+    virtual void CalculateDiffFlowCorrelations(TString type, TString ptOrEta); // type = RP or POI
+    virtual void CalculateDiffFlowCorrelationsUsingParticleWeights(TString type, TString ptOrEta); // type = RP or POI 
+    virtual void CalculateDiffFlowProductOfCorrelations(TString type, TString ptOrEta); // type = RP or POI
+    virtual void CalculateDiffFlowSumOfEventWeights(TString type, TString ptOrEta); // type = RP or POI
+    virtual void CalculateDiffFlowSumOfProductOfEventWeights(TString type, TString ptOrEta); // type = RP or POI
+    virtual void CalculateDiffFlowCorrectionsForNUASinTerms(TString type, TString ptOrEta);  
+    virtual void CalculateDiffFlowCorrectionsForNUACosTerms(TString type, TString ptOrEta);
+    // ...
+    //virtual void CalculateCorrelationsForDifferentialFlow2D(TString type); // type = RP or POI
+    //virtual void CalculateCorrectionsForNonUniformAcceptanceForDifferentialFlowCosTerms(TString type); // type = RP or POI  
+    //virtual void CalculateCorrectionsForNonUniformAcceptanceForDifferentialFlowSinTerms(TString type); // type = RP or POI
+    virtual void EvaluateDiffFlowCorrelationsWithNestedLoops(AliFlowEventSimple* anEvent, TString type, TString ptOrEta);
+    virtual void EvaluateDiffFlowCorrelationsWithNestedLoopsUsingParticleWeights(AliFlowEventSimple* anEvent, TString type, TString ptOrEta); 
+    virtual void EvaluateDiffFlowCorrectionTermsForNUAWithNestedLoops(AliFlowEventSimple* anEvent, TString type, TString ptOrEta);
+  // 3.) method Finish() and methods called within Finish():
   virtual void Finish();
-  
+    // 3a.) integrated flow:
+    virtual void FinalizeCorrelationsIntFlow();
+    virtual void FinalizeCorrectionTermsForNUAIntFlow(); 
+    virtual void CalculateCovariancesIntFlow();  
+    virtual void CalculateCumulantsIntFlow(); 
+    virtual void CalculateIntFlow(); 
+    virtual void FillCommonHistResultsIntFlow();
+    // nua:   
+    //virtual void CalculateCorrectionsForNUAForIntQcumulants();
+    virtual void CalculateQcumulantsCorrectedForNUAIntFlow(); 
+    virtual void CalculateIntFlowCorrectedForNUA(); 
+    //virtual void ApplyCorrectionForNonUniformAcceptanceToCumulantsForIntFlow(Bool_t useParticleWeights, TString eventWeights); 
+    //virtual void PrintQuantifyingCorrectionsForNonUniformAcceptance(Bool_t useParticleWeights, TString eventWeights);
+    virtual void PrintFinalResultsForIntegratedFlow(TString type);
+    virtual void CrossCheckIntFlowCorrelations();
+    virtual void CrossCheckIntFlowExtraCorrelations(); // extra correlations which appear only when particle weights are used
+    virtual void CrossCheckIntFlowCorrectionTermsForNUA(); 
+    // 3b.) differential flow:
+    virtual void FinalizeReducedCorrelations(TString type, TString ptOrEta);
+    virtual void CalculateDiffFlowCovariances(TString type, TString ptOrEta); 
+    virtual void CalculateDiffFlowCumulants(TString type, TString ptOrEta); 
+    virtual void CalculateDiffFlow(TString type, TString ptOrEta); 
+    virtual void FinalizeCorrectionTermsForNUADiffFlow(TString type, TString ptOrEta); 
+    virtual void CalculateDiffFlowCumulantsCorrectedForNUA(TString type, TString ptOrEta);   \r
+    virtual void CalculateDiffFlowCorrectedForNUA(TString type, TString ptOrEta); 
+    virtual void CalculateFinalResultsForRPandPOIIntegratedFlow(TString type); // to be improved (add also possibility to integrate over eta yield)
+    virtual void FillCommonHistResultsDiffFlow(TString type);   
+    virtual void CrossCheckDiffFlowCorrelations(TString type, TString ptOrEta); 
+    virtual void CrossCheckDiffFlowCorrectionTermsForNUA(TString type, TString ptOrEta); 
+        
+    // to be improved (removed):
+    //virtual void FinalizeCorrelationsForDiffFlow(TString type, Bool_t useParticleWeights, TString eventWeights); 
+      
+  // 4.)  method GetOutputHistograms() and methods called within GetOutputHistograms(): 
+  virtual void GetOutputHistograms(TList *outputListHistos);
+    virtual void GetPointersForCommonHistograms(TList *outputListHistos); 
+    virtual void GetPointersForParticleWeightsHistograms(TList *outputListHistos);
+    virtual void GetPointersForIntFlowHistograms(TList *outputListHistos); 
+    virtual void GetPointersForDiffFlowHistograms(TList *outputListHistos); 
+    virtual void GetPointersForNestedLoopsHistograms(TList *outputListHistos); // to be improved (no need to pass here argument, use setter for base list instead)
+    
+  // 5.) other methods:   
   TProfile* MakePtProjection(TProfile2D *profilePtEta) const;
   TProfile* MakeEtaProjection(TProfile2D *profilePtEta) const;
-  
-  virtual void CalculateFinalResultsForNoNameIntegratedFlow(Bool_t useWeights=kFALSE);
-  virtual void CalculateFinalResultsForRPandPOIIntegratedFlow(Bool_t useWeights, TString type);
-  virtual void CalculateFinalResultsForDifferentialFlow(TH2D *flowPtEta, TH1D *flowPt, TH1D *flowEta, 
-                                                        TProfile2D *profile2ndPtEta, TProfile2D *profile4thPtEta = NULL, 
-                                                        TProfile2D *profile6thPtEta = NULL, TProfile2D *profile8thPtEta = NULL);
-  
-  virtual void PrintFinalResultsForIntegratedFlow(Bool_t useWeights=kTRUE, TString type="NONAME");
-    
-  virtual void CompareDirectAndQCorrelationsForIntegratedFlow(Bool_t useWeights);
-  virtual void CompareDirectAndQCorrelationsForDifferentialFlow(Bool_t useWeights);
-
   virtual void WriteHistograms(TString outputFileName);
   
-  virtual void TempDeleteMe();
-//----------------------------------------------------------------------------------------------------------------
-//                                            setters and getters                                                 
-//----------------------------------------------------------------------------------------------------------------
-  TList* GetHistList() const {return this->fHistList;} 
-  
-  void SetWeightsList(TList* wlist) {this->fWeightsList = wlist;}
-  TList* GetWeightsList() const {return this->fWeightsList;}  
-  
-  void SetResultsList(TList* rlist) {this->fResultsList = rlist;}
-  TList* GetResultsList() const {return this->fResultsList;}  
-  void SetIntFlowResults(TH1D* const ifr) {this->fIntFlowResultsQC = ifr;};
-  TH1D* GetIntFlowResults() const {return this->fIntFlowResultsQC;};
+  // **** SETTERS and GETTERS ****
   
-  void SetIntFlowResultsW(TH1D* const ifrw) {this->fIntFlowResultsQCW = ifrw;};
-  TH1D* GetIntFlowResultsW() const {return this->fIntFlowResultsQCW;};
-  
-  void SetIntFlowResultsPOI(TH1D* const ifrp) {this->fIntFlowResultsPOIQC = ifrp;};
-  TH1D* GetIntFlowResultsPOI() const {return this->fIntFlowResultsPOIQC;};
-  
-  void SetIntFlowResultsPOIW(TH1D* const ifrpw) {this->fIntFlowResultsPOIQCW = ifrpw;};
-  TH1D* GetIntFlowResultsPOIW() const {return this->fIntFlowResultsPOIQCW;};
-
-  void SetIntFlowResultsRP(TH1D* const ifrr) {this->fIntFlowResultsRPQC = ifrr;};
-  TH1D* GetIntFlowResultsRP() const {return this->fIntFlowResultsRPQC;};
-  
-  void SetIntFlowResultsRPW(TH1D* const ifrrw) {this->fIntFlowResultsRPQCW = ifrrw;};
-  TH1D* GetIntFlowResultsRPW() const {return this->fIntFlowResultsRPQCW;};
-
-
-
-
-
-  void SetDiffFlowResults2nd(TH1D* const diff2nd) {this->fDiffFlowResults2ndOrderQC = diff2nd;};
-  TH1D* GetDiffFlowResults2nd() const {return this->fDiffFlowResults2ndOrderQC;};
-  
-  void SetDiffFlowResults4th(TH1D* const diff4th) {this->fDiffFlowResults4thOrderQC = diff4th;};
-  TH1D* GetDiffFlowResults4th() const {return this->fDiffFlowResults4thOrderQC;};
-  
-  void SetCovariances(TH1D* const cov) {this->fCovariances = cov;};
-  TH1D* GetCovariances() const {return this->fCovariances;};
+  // 0.) base:                                                                                              
+  TList* GetHistList() const {return this->fHistList;} 
   
+  // 1.) common:
+  void SetCommonHists(AliFlowCommonHist* const ch) {this->fCommonHists = ch;};
+  AliFlowCommonHist* GetCommonHists() const {return this->fCommonHists;};
   void SetCommonHists2nd(AliFlowCommonHist* const ch2nd) {this->fCommonHists2nd = ch2nd;};
   AliFlowCommonHist* GetCommonHists2nd() const {return this->fCommonHists2nd;};
-  
   void SetCommonHists4th(AliFlowCommonHist* const ch4th) {this->fCommonHists4th = ch4th;};
   AliFlowCommonHist* GetCommonHists4th() const {return this->fCommonHists4th;};
-  
   void SetCommonHists6th(AliFlowCommonHist* const ch6th) {this->fCommonHists6th = ch6th;};
   AliFlowCommonHist* GetCommonHists6th() const {return this->fCommonHists6th;};
-  
   void SetCommonHists8th(AliFlowCommonHist* const ch8th) {this->fCommonHists8th = ch8th;};
   AliFlowCommonHist* GetCommonHists8th() const {return this->fCommonHists8th;};
-  
   void SetCommonHistsResults2nd(AliFlowCommonHistResults* const chr2nd) {this->fCommonHistsResults2nd = chr2nd;};
   AliFlowCommonHistResults* GetCommonHistsResults2nd() const {return this->fCommonHistsResults2nd;};
-  
   void SetCommonHistsResults4th(AliFlowCommonHistResults* const chr4th) {this->fCommonHistsResults4th = chr4th;};
   AliFlowCommonHistResults* GetCommonHistsResults4th() const {return this->fCommonHistsResults4th;};
-  
   void SetCommonHistsResults6th(AliFlowCommonHistResults* const chr6th) {this->fCommonHistsResults6th = chr6th;};
   AliFlowCommonHistResults* GetCommonHistsResults6th() const {return this->fCommonHistsResults6th;};
-  
   void SetCommonHistsResults8th(AliFlowCommonHistResults* const chr8th) {this->fCommonHistsResults8th = chr8th;};
   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;};
   
-  void SetAverageMultiplicity(TProfile* const am) {this->fAvMultIntFlowQC = am;};
-  TProfile* GetAverageMultiplicity() const {return this->fAvMultIntFlowQC;};
-  
-  void SetQvectorForEachEventX(TProfile* const qvfeex) {this->fQvectorForEachEventX = qvfeex;};
-  TProfile* GetQvectorForEachEventX() const {return this->fQvectorForEachEventX;};
-
-  void SetQvectorForEachEventY(TProfile* const qvfeey) {this->fQvectorForEachEventY = qvfeey;};
-  TProfile* GetQvectorForEachEventY() const {return this->fQvectorForEachEventY;};
-        
-  void SetQCorrelations(TProfile* const QCorr) {this->fQCorrelations = QCorr;};
-  TProfile* GetQCorrelations() const {return this->fQCorrelations;};
-  
-  void SetQCorrelationsW(TProfile* const QCorrW) {this->fQCorrelationsW = QCorrW;};
-  TProfile* GetQCorrelationsW() const {return this->fQCorrelationsW;};
-  
-  void SetQProduct(TProfile* const qp) {this->fQProduct = qp;};
-  TProfile* GetQProduct() const {return this->fQProduct;};
-  
-  void SetQVectorComponents(TProfile* const qvc) {this->fQvectorComponents = qvc;};
-  TProfile* GetQVectorComponents() const {return this->fQvectorComponents;};
-  
-  void SetTwo1n1nPerPtBinRP(TProfile* const pb2PerPtBin1n1nRP) {this->f2PerPtBin1n1nRP = pb2PerPtBin1n1nRP;};
-  TProfile* GetTwo1n1nPerPtBinRP() const {return this->f2PerPtBin1n1nRP;};
-  
-  void SetFour1n1n1n1nPerPtBinRP(TProfile* const pb4PerPtBin1n1n1n1nRP) {this->f4PerPtBin1n1n1n1nRP = pb4PerPtBin1n1n1n1nRP;};
-  TProfile* GetFour1n1n1n1nPerPtBinRP() const {return this->f4PerPtBin1n1n1n1nRP;}; 
-
-  void SetTwo1n1nPerEtaBinRP(TProfile* const pb2PerEtaBin1n1nRP) {this->f2PerEtaBin1n1nRP = pb2PerEtaBin1n1nRP;};
-  TProfile* GetTwo1n1nPerEtaBinRP() const {return this->f2PerEtaBin1n1nRP;};
-  
-  void SetFour1n1n1n1nPerEtaBinRP(TProfile* const pb4PerEtaBin1n1n1n1nRP) {this->f4PerEtaBin1n1n1n1nRP = pb4PerEtaBin1n1n1n1nRP;};
-  TProfile* GetFour1n1n1n1nPerEtaBinRP() const {return this->f4PerEtaBin1n1n1n1nRP;}; 
-  
-  void SetTwo1n1nPerPtBinPOI(TProfile* const pb2PerPtBin1n1nPOI) {this->f2PerPtBin1n1nPOI = pb2PerPtBin1n1nPOI;};
-  TProfile* GetTwo1n1nPerPtBinPOI() const {return this->f2PerPtBin1n1nPOI;};
-  
-  void SetFour1n1n1n1nPerPtBinPOI(TProfile* const pb4PerPtBin1n1n1n1nPOI) {this->f4PerPtBin1n1n1n1nPOI = pb4PerPtBin1n1n1n1nPOI;};
-  TProfile* GetFour1n1n1n1nPerPtBinPOI() const {return this->f4PerPtBin1n1n1n1nPOI;}; 
-  
-  void SetTwo1n1nPerEtaBinPOI(TProfile* const pb2PerEtaBin1n1nPOI) {this->f2PerEtaBin1n1nPOI = pb2PerEtaBin1n1nPOI;};
-  TProfile* GetTwo1n1nPerEtaBinPOI() const {return this->f2PerEtaBin1n1nPOI;};
-  
-  void SetFour1n1n1n1nPerEtaBinPOI(TProfile* const pb4PerEtaBin1n1n1n1nPOI) {this->f4PerEtaBin1n1n1n1nPOI = pb4PerEtaBin1n1n1n1nPOI;};
-  TProfile* GetFour1n1n1n1nPerEtaBinPOI() const {return this->f4PerEtaBin1n1n1n1nPOI;}; 
-  
-  void SetTwo1n1nWPerPtBinPOI(TProfile* const pb2WPerPtBin1n1nPOI) {this->f2WPerPtBin1n1nPOI = pb2WPerPtBin1n1nPOI;};
-  TProfile* GetTwo1n1nWPerPtBinPOI() const {return this->f2WPerPtBin1n1nPOI;};
-  
-  void SetFour1n1n1n1nWPerPtBinPOI(TProfile* const pb4WPerPtBin1n1n1n1nPOI) {this->f4WPerPtBin1n1n1n1nPOI = pb4WPerPtBin1n1n1n1nPOI;};
-  TProfile* GetFour1n1n1n1nWPerPtBinPOI() const {return this->f4WPerPtBin1n1n1n1nPOI;}
-  
-  void SetTwo1n1nWPerEtaBinPOI(TProfile* const pb2WPerEtaBin1n1nPOI) {this->f2WPerEtaBin1n1nPOI = pb2WPerEtaBin1n1nPOI;};
-  TProfile* GetTwo1n1nWPerEtaBinPOI() const {return this->f2WPerEtaBin1n1nPOI;};
-  
-  void SetFour1n1n1n1nWPerEtaBinPOI(TProfile* const pb4WPerEtaBin1n1n1n1nPOI) {this->f4WPerEtaBin1n1n1n1nPOI = pb4WPerEtaBin1n1n1n1nPOI;};
-  TProfile* GetFour1n1n1n1nWPerEtaBinPOI() const {return this->f4WPerEtaBin1n1n1n1nPOI;}
-  
-  void SetTwo1n1nWPerPtBinRP(TProfile* const pb2WPerPtBin1n1nRP) {this->f2WPerPtBin1n1nRP = pb2WPerPtBin1n1nRP;};
-  TProfile* GetTwo1n1nWPerPtBinRP() const {return this->f2WPerPtBin1n1nRP;};
-  
-  void SetFour1n1n1n1nWPerPtBinRP(TProfile* const pb4WPerPtBin1n1n1n1nRP) {this->f4WPerPtBin1n1n1n1nRP = pb4WPerPtBin1n1n1n1nRP;};
-  TProfile* GetFour1n1n1n1nWPerPtBinRP() const {return this->f4WPerPtBin1n1n1n1nRP;}
-  
-  void SetTwo1n1nWPerEtaBinRP(TProfile* const pb2WPerEtaBin1n1nRP) {this->f2WPerEtaBin1n1nRP = pb2WPerEtaBin1n1nRP;};
-  TProfile* GetTwo1n1nWPerEtaBinRP() const {return this->f2WPerEtaBin1n1nRP;};
-  
-  void SetFour1n1n1n1nWPerEtaBinRP(TProfile* const pb4WPerEtaBin1n1n1n1nRP) {this->f4WPerEtaBin1n1n1n1nRP = pb4WPerEtaBin1n1n1n1nRP;};
-  TProfile* GetFour1n1n1n1nWPerEtaBinRP() const {return this->f4WPerEtaBin1n1n1n1nRP;}
-  
-  void SetDirectCorrelations(TProfile* const dc) {this->fDirectCorrelations = dc;};
-  TProfile* GetDirectCorrelations() const {return this->fDirectCorrelations;};
-  
-  void SetDirectCorrelationsW(TProfile* const dcw) {this->fDirectCorrelationsW = dcw;};
-  TProfile* GetDirectCorrelationsW() const {return this->fDirectCorrelationsW;};
-  
-  void SetDirectCorrelationsDiffFlow(TProfile* const dcdf) {this->fDirectCorrelationsDiffFlow = dcdf;};
-  TProfile* GetDirectCorrelationsDiffFlow() const {return this->fDirectCorrelationsDiffFlow;};
-  
-  void SetDirectCorrelationsDiffFlowW(TProfile* const dcdfw) {this->fDirectCorrelationsDiffFlowW = dcdfw;};
-  TProfile* GetDirectCorrelationsDiffFlowW() const {return this->fDirectCorrelationsDiffFlowW;};
-  
+  // 2.) particle weights:
+  void SetWeightsList(TList* wlist) {this->fWeightsList = (TList*)wlist->Clone();}
+  TList* GetWeightsList() const {return this->fWeightsList;}  
   void SetUsePhiWeights(Bool_t const uPhiW) {this->fUsePhiWeights = uPhiW;};
   Bool_t GetUsePhiWeights() const {return this->fUsePhiWeights;};
-  
   void SetUsePtWeights(Bool_t const uPtW) {this->fUsePtWeights = uPtW;};
   Bool_t GetUsePtWeights() const {return this->fUsePtWeights;};
-  
   void SetUseEtaWeights(Bool_t const uEtaW) {this->fUseEtaWeights = uEtaW;};
   Bool_t GetUseEtaWeights() const {return this->fUseEtaWeights;};
-  
-  void SetUseWeights(Bool_t const uw) {this->fUseWeights = uw;};
-  Bool_t GetUseWeights() const {return this->fUseWeights;};
-  
-  void SetUseWeightsBits(TBits* const uwb) {this->fUseWeightsBits = uwb;};
-  TBits* GetUseWeightsBits() const {return this->fUseWeightsBits;};
-  
-  
-  
-  
-  
-  
-  
-  // .................................................................................................
-  // non-weighted correlations for differential flow of POIs:
-  void Set2pPtEtaPOI(TProfile2D* const tppep) {this->f2pPtEtaPOI = tppep;};
-  TProfile2D* Get2pPtEtaPOI() const {return this->f2pPtEtaPOI;};
-  void Set4pPtEtaPOI(TProfile2D* const fppep) {this->f4pPtEtaPOI = fppep;};
-  TProfile2D* Get4pPtEtaPOI() const {return this->f4pPtEtaPOI;};
-  void Set6pPtEtaPOI(TProfile2D* const sppep) {this->f6pPtEtaPOI = sppep;};
-  TProfile2D* Get6pPtEtaPOI() const {return this->f6pPtEtaPOI;};
-  void Set8pPtEtaPOI(TProfile2D* const eppep) {this->f8pPtEtaPOI = eppep;};
-  TProfile2D* Get8pPtEtaPOI() const {return this->f8pPtEtaPOI;};
-  
-  // non-weighted final results for differential flow of POIs:
-  // 3D (pt,eta):
-  void Setvn2ndPtEtaPOI(TH2D* const v2pep) {this->fvn2ndPtEtaPOI = v2pep;};
-  TH2D* Getvn2ndPtEtaPOI() const {return this->fvn2ndPtEtaPOI;};
-  void Setvn4thPtEtaPOI(TH2D* const v4pep) {this->fvn4thPtEtaPOI = v4pep;};
-  TH2D* Getvn4thPtEtaPOI() const {return this->fvn4thPtEtaPOI;};
-  void Setvn6thPtEtaPOI(TH2D* const v6pep) {this->fvn6thPtEtaPOI = v6pep;};
-  TH2D* Getvn6thPtEtaPOI() const {return this->fvn6thPtEtaPOI;};
-  void Setvn8thPtEtaPOI(TH2D* const v8pep) {this->fvn8thPtEtaPOI = v8pep;};
-  TH2D* Getvn8thPtEtaPOI() const {return this->fvn8thPtEtaPOI;};
-  // 2D (pt):
-  void Setvn2ndPtPOI(TH1D* const v2pp) {this->fvn2ndPtPOI = v2pp;};
-  TH1D* Getvn2ndPtPOI() const {return this->fvn2ndPtPOI;};
-  void Setvn4thPtPOI(TH1D* const v4pp) {this->fvn4thPtPOI = v4pp;};
-  TH1D* Getvn4thPtPOI() const {return this->fvn4thPtPOI;};
-  void Setvn6thPtPOI(TH1D* const v6pp) {this->fvn6thPtPOI = v6pp;};
-  TH1D* Getvn6thPtPOI() const {return this->fvn6thPtPOI;};
-  void Setvn8thPtPOI(TH1D* const v8pp) {this->fvn8thPtPOI = v8pp;};
-  TH1D* Getvn8thPtPOI() const {return this->fvn8thPtPOI;};
-  // 2D (eta):
-  void Setvn2ndEtaPOI(TH1D* const v2ep) {this->fvn2ndEtaPOI = v2ep;};
-  TH1D* Getvn2ndEtaPOI() const {return this->fvn2ndEtaPOI;};
-  void Setvn4thEtaPOI(TH1D* const v4ep) {this->fvn4thEtaPOI = v4ep;};
-  TH1D* Getvn4thEtaPOI() const {return this->fvn4thEtaPOI;};
-  void Setvn6thEtaPOI(TH1D* const v6ep) {this->fvn6thEtaPOI = v6ep;};
-  TH1D* Getvn6thEtaPOI() const {return this->fvn6thEtaPOI;};
-  void Setvn8thEtaPOI(TH1D* const v8ep) {this->fvn8thEtaPOI = v8ep;};
-  TH1D* Getvn8thEtaPOI() const {return this->fvn8thEtaPOI;};
-  
-  // weighted correlations for differential flow of POIs:
-  void Set2pPtEtaPOIW(TProfile2D* const tppepw) {this->f2pPtEtaPOIW = tppepw;};
-  TProfile2D* Get2pPtEtaPOIW() const {return this->f2pPtEtaPOIW;};
-  void Set4pPtEtaPOIW(TProfile2D* const fppepw) {this->f4pPtEtaPOIW = fppepw;};
-  TProfile2D* Get4pPtEtaPOIW() const {return this->f4pPtEtaPOIW;};
-  void Set6pPtEtaPOIW(TProfile2D* const sppepw) {this->f6pPtEtaPOIW = sppepw;};
-  TProfile2D* Get6pPtEtaPOIW() const {return this->f6pPtEtaPOIW;};
-  void Set8pPtEtaPOIW(TProfile2D* const eppepw) {this->f8pPtEtaPOIW = eppepw;};
-  TProfile2D* Get8pPtEtaPOIW() const {return this->f8pPtEtaPOIW;};
-  
-  // weighted final results for differential flow of POIs:
-  // 3D (pt,eta):
-  void Setvn2ndPtEtaPOIW(TH2D* const v2pepw) {this->fvn2ndPtEtaPOIW = v2pepw;};
-  TH2D* Getvn2ndPtEtaPOIW() const {return this->fvn2ndPtEtaPOIW;};
-  void Setvn4thPtEtaPOIW(TH2D* const v4pepw) {this->fvn4thPtEtaPOIW = v4pepw;};
-  TH2D* Getvn4thPtEtaPOIW() const {return this->fvn4thPtEtaPOIW;};
-  void Setvn6thPtEtaPOIW(TH2D* const v6pepw) {this->fvn6thPtEtaPOIW = v6pepw;};
-  TH2D* Getvn6thPtEtaPOIW() const {return this->fvn6thPtEtaPOIW;};
-  void Setvn8thPtEtaPOIW(TH2D* const v8pepw) {this->fvn8thPtEtaPOIW = v8pepw;};
-  TH2D* Getvn8thPtEtaPOIW() const {return this->fvn8thPtEtaPOIW;};
-  // 2D (pt):
-  void Setvn2ndPtPOIW(TH1D* const v2ppw) {this->fvn2ndPtPOIW = v2ppw;};
-  TH1D* Getvn2ndPtPOIW() const {return this->fvn2ndPtPOIW;};
-  void Setvn4thPtPOIW(TH1D* const v4ppw) {this->fvn4thPtPOIW = v4ppw;};
-  TH1D* Getvn4thPtPOIW() const {return this->fvn4thPtPOIW;};
-  void Setvn6thPtPOIW(TH1D* const v6ppw) {this->fvn6thPtPOIW = v6ppw;};
-  TH1D* Getvn6thPtPOIW() const {return this->fvn6thPtPOIW;};
-  void Setvn8thPtPOIW(TH1D* const v8ppw) {this->fvn8thPtPOIW = v8ppw;};
-  TH1D* Getvn8thPtPOIW() const {return this->fvn8thPtPOIW;};
-  // 2D (eta):
-  void Setvn2ndEtaPOIW(TH1D* const v2epw) {this->fvn2ndEtaPOIW = v2epw;};
-  TH1D* Getvn2ndEtaPOIW() const {return this->fvn2ndEtaPOIW;};
-  void Setvn4thEtaPOIW(TH1D* const v4epw) {this->fvn4thEtaPOIW = v4epw;};
-  TH1D* Getvn4thEtaPOIW() const {return this->fvn4thEtaPOIW;};
-  void Setvn6thEtaPOIW(TH1D* const v6epw) {this->fvn6thEtaPOIW = v6epw;};
-  TH1D* Getvn6thEtaPOIW() const {return this->fvn6thEtaPOIW;};
-  void Setvn8thEtaPOIW(TH1D* const v8epw) {this->fvn8thEtaPOIW = v8epw;};
-  TH1D* Getvn8thEtaPOIW() const {return this->fvn8thEtaPOIW;};
-       
-  // non-weighted correlations for differential flow of RPs:
-  void Set2pPtEtaRP(TProfile2D* const tpper) {this->f2pPtEtaRP = tpper;};
-  TProfile2D* Get2pPtEtaRP() const {return this->f2pPtEtaRP;};
-  void Set4pPtEtaRP(TProfile2D* const fpper) {this->f4pPtEtaRP = fpper;};
-  TProfile2D* Get4pPtEtaRP() const {return this->f4pPtEtaRP;};
-  void Set6pPtEtaRP(TProfile2D* const spper) {this->f6pPtEtaRP = spper;};
-  TProfile2D* Get6pPtEtaRP() const {return this->f6pPtEtaRP;};
-  void Set8pPtEtaRP(TProfile2D* const epper) {this->f8pPtEtaRP = epper;};
-  TProfile2D* Get8pPtEtaRP() const {return this->f8pPtEtaRP;};
-  
-  // non-weighted final results for differential flow of RPs:
-  // 3D (pt,eta):
-  void Setvn2ndPtEtaRP(TH2D* const v2per) {this->fvn2ndPtEtaRP = v2per;};
-  TH2D* Getvn2ndPtEtaRP() const {return this->fvn2ndPtEtaRP;};
-  void Setvn4thPtEtaRP(TH2D* const v4per) {this->fvn4thPtEtaRP = v4per;};
-  TH2D* Getvn4thPtEtaRP() const {return this->fvn4thPtEtaRP;};
-  void Setvn6thPtEtaRP(TH2D* const v6per) {this->fvn6thPtEtaRP = v6per;};
-  TH2D* Getvn6thPtEtaRP() const {return this->fvn6thPtEtaRP;};
-  void Setvn8thPtEtaRP(TH2D* const v8per) {this->fvn4thPtEtaRP = v8per;};
-  TH2D* Getvn8thPtEtaRP() const {return this->fvn8thPtEtaRP;};
-  // 2D (pt):
-  void Setvn2ndPtRP(TH1D* const v2pp) {this->fvn2ndPtRP = v2pp;};
-  TH1D* Getvn2ndPtRP() const {return this->fvn2ndPtRP;};
-  void Setvn4thPtRP(TH1D* const v4pp) {this->fvn4thPtRP = v4pp;};
-  TH1D* Getvn4thPtRP() const {return this->fvn4thPtRP;};
-  void Setvn6thPtRP(TH1D* const v6pp) {this->fvn6thPtRP = v6pp;};
-  TH1D* Getvn6thPtRP() const {return this->fvn6thPtRP;};
-  void Setvn8thPtRP(TH1D* const v8pp) {this->fvn8thPtRP = v8pp;};
-  TH1D* Getvn8thPtRP() const {return this->fvn8thPtRP;};
-  // 2D (eta):
-  void Setvn2ndEtaRP(TH1D* const v2ep) {this->fvn2ndEtaRP = v2ep;};
-  TH1D* Getvn2ndEtaRP() const {return this->fvn2ndEtaRP;};
-  void Setvn4thEtaRP(TH1D* const v4ep) {this->fvn4thEtaRP = v4ep;};
-  TH1D* Getvn4thEtaRP() const {return this->fvn4thEtaRP;};
-  void Setvn6thEtaRP(TH1D* const v6ep) {this->fvn6thEtaRP = v6ep;};
-  TH1D* Getvn6thEtaRP() const {return this->fvn6thEtaRP;};
-  void Setvn8thEtaRP(TH1D* const v8ep) {this->fvn8thEtaRP = v8ep;};
-  TH1D* Getvn8thEtaRP() const {return this->fvn8thEtaRP;};
-  
-  // weighted correlations for differential flow of RPs:
-  void Set2pPtEtaRPW(TProfile2D* const tpperw) {this->f2pPtEtaRPW = tpperw;};
-  TProfile2D* Get2pPtEtaRPW() const {return this->f2pPtEtaRPW;};
-  void Set4pPtEtaRPW(TProfile2D* const fpperw) {this->f4pPtEtaRPW = fpperw;};
-  TProfile2D* Get4pPtEtaRPW() const {return this->f4pPtEtaRPW;};
-  void Set6pPtEtaRPW(TProfile2D* const spperw) {this->f6pPtEtaRPW = spperw;};
-  TProfile2D* Get6pPtEtaRPW() const {return this->f6pPtEtaRPW;};
-  void Set8pPtEtaRPW(TProfile2D* const epperw) {this->f8pPtEtaRPW = epperw;};
-  TProfile2D* Get8pPtEtaRPW() const {return this->f8pPtEtaRPW;};
-  
-  // weighted final results for differential flow of RPs:
-  // 3D (pt,eta):
-  void Setvn2ndPtEtaRPW(TH2D* const v2perw) {this->fvn2ndPtEtaRPW = v2perw;};
-  TH2D* Getvn2ndPtEtaRPW() const {return this->fvn2ndPtEtaRPW;}; 
-  void Setvn4thPtEtaRPW(TH2D* const v4perw) {this->fvn4thPtEtaRPW = v4perw;};
-  TH2D* Getvn4thPtEtaRPW() const {return this->fvn4thPtEtaRPW;};
-  void Setvn6thPtEtaRPW(TH2D* const v6perw) {this->fvn6thPtEtaRPW = v6perw;};
-  TH2D* Getvn6thPtEtaRPW() const {return this->fvn6thPtEtaRPW;};
-  void Setvn8thPtEtaRPW(TH2D* const v8perw) {this->fvn4thPtEtaRPW = v8perw;};
-  TH2D* Getvn8thPtEtaRPW() const {return this->fvn8thPtEtaRPW;};
-  // 2D (pt):
-  void Setvn2ndPtRPW(TH1D* const v2ppw) {this->fvn2ndPtRPW = v2ppw;};
-  TH1D* Getvn2ndPtRPW() const {return this->fvn2ndPtRPW;};
-  void Setvn4thPtRPW(TH1D* const v4ppw) {this->fvn4thPtRPW = v4ppw;};
-  TH1D* Getvn4thPtRPW() const {return this->fvn4thPtRPW;};
-  void Setvn6thPtRPW(TH1D* const v6ppw) {this->fvn6thPtRPW = v6ppw;};
-  TH1D* Getvn6thPtRPW() const {return this->fvn6thPtRPW;};
-  void Setvn8thPtRPW(TH1D* const v8ppw) {this->fvn8thPtRPW = v8ppw;};
-  TH1D* Getvn8thPtRPW() const {return this->fvn8thPtRPW;};
-  // 2D (eta):
-  void Setvn2ndEtaRPW(TH1D* const v2epw) {this->fvn2ndEtaRPW = v2epw;};
-  TH1D* Getvn2ndEtaRPW() const {return this->fvn2ndEtaRPW;};
-  void Setvn4thEtaRPW(TH1D* const v4epw) {this->fvn4thEtaRPW = v4epw;};
-  TH1D* Getvn4thEtaRPW() const {return this->fvn4thEtaRPW;};
-  void Setvn6thEtaRPW(TH1D* const v6epw) {this->fvn6thEtaRPW = v6epw;};
-  TH1D* Getvn6thEtaRPW() const {return this->fvn6thEtaRPW;};
-  void Setvn8thEtaRPW(TH1D* const v8epw) {this->fvn8thEtaRPW = v8epw;};
-  TH1D* Getvn8thEtaRPW() const {return this->fvn8thEtaRPW;};
-  // .................................................................................................
-  
-  
-  
-  
-//----------------------------------------------------------------------------------------------------------------
+  void SetUseParticleWeights(TProfile* const uPW) {this->fUseParticleWeights = uPW;};
+  TProfile* GetUseParticleWeights() const {return this->fUseParticleWeights;};
+  void SetPhiWeights(TH1F* const histPhiWeights) {this->fPhiWeights = histPhiWeights;};
+  TH1F* GetPhiWeights() const {return this->fPhiWeights;};
+  void SetPtWeights(TH1D* const histPtWeights) {this->fPtWeights = histPtWeights;};
+  TH1D* GetPtWeights() const {return this->fPtWeights;};
+  void SetEtaWeights(TH1D* const histEtaWeights) {this->fEtaWeights = histEtaWeights;};
+  TH1D* GetEtaWeights() const {return this->fEtaWeights;};
+  
+  // 3.) integrated flow:
+  // flags:
+  void SetIntFlowFlags(TProfile* const intFlowFlags) {this->fIntFlowFlags = intFlowFlags;};
+  TProfile* GetIntFlowFlags() const {return this->fIntFlowFlags;};
+  void SetApplyCorrectionForNUA(Bool_t const applyCorrectionForNUA) {this->fApplyCorrectionForNUA = applyCorrectionForNUA;};
+  Bool_t GetApplyCorrectionForNUA() const {return this->fApplyCorrectionForNUA;};
+  // integrated flow profiles:
+  void SetAvMultiplicity(TProfile* const avMultiplicity) {this->fAvMultiplicity = avMultiplicity;};
+  TProfile* GetAvMultiplicity() const {return this->fAvMultiplicity;};
+  void SetIntFlowCorrelationsPro(TProfile* const intFlowCorrelationsPro) {this->fIntFlowCorrelationsPro = intFlowCorrelationsPro;};
+  TProfile* GetIntFlowCorrelationsPro() const {return this->fIntFlowCorrelationsPro;};
+  void SetIntFlowCorrelationsAllPro(TProfile* const intFlowCorrelationsAllPro) {this->fIntFlowCorrelationsAllPro = intFlowCorrelationsAllPro;};
+  TProfile* GetIntFlowCorrelationsAllPro() const {return this->fIntFlowCorrelationsAllPro;};  
+  void SetIntFlowExtraCorrelationsPro(TProfile* const intFlowExtraCorrelationsPro) {this->fIntFlowExtraCorrelationsPro = intFlowExtraCorrelationsPro;};
+  TProfile* GetIntFlowExtraCorrelationsPro() const {return this->fIntFlowExtraCorrelationsPro;};  
+  void SetIntFlowProductOfCorrelationsPro(TProfile* const intFlowProductOfCorrelationsPro) {this->fIntFlowProductOfCorrelationsPro = intFlowProductOfCorrelationsPro;};
+  TProfile* GetIntFlowProductOfCorrelationsPro() const {return this->fIntFlowProductOfCorrelationsPro;};  
+  void SetIntFlowCorrectionTermsForNUAPro(TProfile* const ifctfnp, Int_t sc) {this->fIntFlowCorrectionTermsForNUAPro[sc] = ifctfnp;};
+  TProfile* GetIntFlowCorrectionTermsForNUAPro(Int_t sc) const {return this->fIntFlowCorrectionTermsForNUAPro[sc];};  
+  // integrated flow histograms holding all results:
+  void SetIntFlowCorrelationsHist(TH1D* const intFlowCorrelationsHist) {this->fIntFlowCorrelationsHist = intFlowCorrelationsHist;};
+  TH1D* GetIntFlowCorrelationsHist() const {return this->fIntFlowCorrelationsHist;};
+  void SetIntFlowCorrelationsAllHist(TH1D* const intFlowCorrelationsAllHist) {this->fIntFlowCorrelationsAllHist = intFlowCorrelationsAllHist;};
+  TH1D* GetIntFlowCorrelationsAllHist() const {return this->fIntFlowCorrelationsAllHist;};  
+  // to be improved (removed:)
+  //void SetIntFlowProductOfCorrelationsHist(TH1D* const intFlowProductOfCorrelationsHist) {this->fIntFlowProductOfCorrelationsHist = intFlowProductOfCorrelationsHist;};
+  //TH1D* GetIntFlowProductOfCorrelationsHist() const {return this->fIntFlowProductOfCorrelationsHist;};  
+  void SetIntFlowCorrectionTermsForNUAHist(TH1D* const ifctfnh, Int_t sc) {this->fIntFlowCorrectionTermsForNUAHist[sc] = ifctfnh;};
+  TH1D* GetIntFlowCorrectionTermsForNUAHist(Int_t sc) const {return this->fIntFlowCorrectionTermsForNUAHist[sc];};  
+  void SetIntFlowCovariances(TH1D* const intFlowCovariances) {this->fIntFlowCovariances = intFlowCovariances;};
+  TH1D* GetIntFlowCovariances() const {return this->fIntFlowCovariances;};
+  void SetIntFlowSumOfEventWeights(TH1D* const intFlowSumOfEventWeights, Int_t power) {this->fIntFlowSumOfEventWeights[power] = intFlowSumOfEventWeights;};
+  TH1D* GetIntFlowSumOfEventWeights(Int_t power) const {return this->fIntFlowSumOfEventWeights[power];};
+  void SetIntFlowSumOfProductOfEventWeights(TH1D* const intFlowSumOfProductOfEventWeights) {this->fIntFlowSumOfProductOfEventWeights = intFlowSumOfProductOfEventWeights;};
+  TH1D* GetIntFlowSumOfProductOfEventWeights() const {return this->fIntFlowSumOfProductOfEventWeights;}; 
+  void SetIntFlowQcumulants(TH1D* const intFlowQcumulants) {this->fIntFlowQcumulants = intFlowQcumulants;};
+  TH1D* GetIntFlowQcumulants() const {return this->fIntFlowQcumulants;}; 
+  void SetIntFlow(TH1D* const intFlow) {this->fIntFlow = intFlow;};
+  TH1D* GetIntFlow() const {return this->fIntFlow;};
+  
+  // 4.) differential flow:
+  // flags:
+  void SetDiffFlowFlags(TProfile* const diffFlowFlags) {this->fDiffFlowFlags = diffFlowFlags;};
+  TProfile* GetDiffFlowFlags() const {return this->fDiffFlowFlags;};
+  void SetCalculate2DFlow(Bool_t const calculate2DFlow) {this->fCalculate2DFlow = calculate2DFlow;};
+  Bool_t GetCalculate2DFlow() const {return this->fCalculate2DFlow;};
+  // profiles:
+  // 1D:
+  void SetDiffFlowCorrelationsPro(TProfile* const diffFlowCorrelationsPro, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCorrelationsPro[i][j][k] = diffFlowCorrelationsPro;};
+  TProfile* GetDiffFlowCorrelationsPro(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCorrelationsPro[i][j][k];};
+  void SetDiffFlowProductOfCorrelationsPro(TProfile* const dfpocp, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowProductOfCorrelationsPro[i][j][k][l] = dfpocp;};
+  TProfile* GetDiffFlowProductOfCorrelationsPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowProductOfCorrelationsPro[i][j][k][l];};
+  void SetDiffFlowCorrectionTermsForNUAPro(TProfile* const dfctfnp, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowCorrectionTermsForNUAPro[i][j][k][l] = dfctfnp;};
+  TProfile* GetDiffFlowCorrectionTermsForNUAPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowCorrectionTermsForNUAPro[i][j][k][l];};  
+  // 2D:
+  void SetCorrelationsPro(TProfile2D* const correlPro, Int_t i, Int_t j, Int_t k, Int_t l) {this->fCorrelationsPro[i][j][k][l] = correlPro;};
+  TProfile2D* GetCorrelationsPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fCorrelationsPro[i][j][k][l];};
+  void SetProductsOfCorrelationsPro(TProfile2D* const proOfcorrelPro, Int_t i, Int_t j, Int_t k, Int_t l) {this->fProductsOfCorrelationsPro[i][j][k][l] = proOfcorrelPro;};
+  TProfile2D* GetProductsOfCorrelationsPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fProductsOfCorrelationsPro[i][j][k][l];};
+  void SetCorrectionTermsPro(TProfile2D* const correctTermsPro, Int_t i, Int_t j, Int_t k, Int_t l, Int_t m) {this->fCorrectionTermsPro[i][j][k][l][m] = correctTermsPro;};
+  TProfile2D* GetCorrectionTermsPro(Int_t i, Int_t j, Int_t k, Int_t l, Int_t m) const {return this->fCorrectionTermsPro[i][j][k][l][m];};  
+  // histograms:
+  void SetDiffFlowCorrelationsHist(TH1D* const diffFlowCorrelationsHist, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCorrelationsHist[i][j][k] = diffFlowCorrelationsHist;};
+  TH1D* GetDiffFlowCorrelationsHist(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCorrelationsHist[i][j][k];};
+  void SetDiffFlowCovariances(TH1D* const diffFlowCovariances, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCovariances[i][j][k] = diffFlowCovariances;};
+  TH1D* GetDiffFlowCovariances(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCovariances[i][j][k];};  
+  void SetDiffFlowCumulants(TH1D* const diffFlowCumulants, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCumulants[i][j][k] = diffFlowCumulants;};
+  TH1D* GetDiffFlowCumulants(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCumulants[i][j][k];};
+  void SetDiffFlow(TH1D* const diffFlow, Int_t i, Int_t j, Int_t k) {this->fDiffFlow[i][j][k] = diffFlow;};
+  TH1D* GetDiffFlow(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlow[i][j][k];};
+  void SetDiffFlowSumOfEventWeights(TH1D* const dfsoew, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowSumOfEventWeights[i][j][k][l] = dfsoew;};
+  TH1D* GetDiffFlowSumOfEventWeights(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowSumOfEventWeights[i][j][k][l];};
+  void SetDiffFlowSumOfProductOfEventWeights(TH1D* const dfsopoew, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowSumOfProductOfEventWeights[i][j][k][l] = dfsopoew;};
+  TH1D* GetDiffFlowSumOfProductOfEventWeights(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowSumOfProductOfEventWeights[i][j][k][l];};
+  void SetDiffFlowCorrectionTermsForNUAHist(TH1D* const dfctfnh, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowCorrectionTermsForNUAHist[i][j][k][l] = dfctfnh;};
+  TH1D* GetDiffFlowCorrectionTermsForNUAHist(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowCorrectionTermsForNUAHist[i][j][k][l];};  
+  
+  // x.) debugging and cross-checking:
+  void SetNestedLoopsList(TList* nllist) {this->fNestedLoopsList = nllist;};
+  TList* GetNestedLoopsList() const {return this->fNestedLoopsList;}; 
+  void SetEvaluateIntFlowNestedLoops(Bool_t const eifnl) {this->fEvaluateIntFlowNestedLoops = eifnl;};
+  Bool_t GetEvaluateIntFlowNestedLoops() const {return this->fEvaluateIntFlowNestedLoops;};
+  void SetEvaluateDiffFlowNestedLoops(Bool_t const edfnl) {this->fEvaluateDiffFlowNestedLoops = edfnl;};
+  Bool_t GetEvaluateDiffFlowNestedLoops() const {return this->fEvaluateDiffFlowNestedLoops;};  
+  void SetMaxAllowedMultiplicity(Int_t const maxAllowedMultiplicity) {this->fMaxAllowedMultiplicity = maxAllowedMultiplicity;};
+  Int_t GetMaxAllowedMultiplicity() const {return this->fMaxAllowedMultiplicity;};
+  void SetEvaluateNestedLoops(TProfile* const enl) {this->fEvaluateNestedLoops = enl;};
+  TProfile* GetEvaluateNestedLoops() const {return this->fEvaluateNestedLoops;}; 
+  void SetIntFlowDirectCorrelations(TProfile* const ifdc) {this->fIntFlowDirectCorrelations = ifdc;};
+  TProfile* GetIntFlowDirectCorrelations() const {return this->fIntFlowDirectCorrelations;};
+  void SetIntFlowExtraDirectCorrelations(TProfile* const ifedc) {this->fIntFlowExtraDirectCorrelations = ifedc;};
+  TProfile* GetIntFlowExtraDirectCorrelations() const {return this->fIntFlowExtraDirectCorrelations;};
+  void SetIntFlowDirectCorrectionTermsForNUA(TProfile* const ifdctfn, Int_t sc) {this->fIntFlowDirectCorrectionTermsForNUA[sc] = ifdctfn;};
+  TProfile* GetIntFlowDirectCorrectionTermsForNUA(Int_t sc) const {return this->fIntFlowDirectCorrectionTermsForNUA[sc];};  
+  void SetCrossCheckInPtBinNo(Int_t const crossCheckInPtBinNo) {this->fCrossCheckInPtBinNo = crossCheckInPtBinNo;};
+  Int_t GetCrossCheckInPtBinNo() const {return this->fCrossCheckInPtBinNo;};
+  void SetCrossCheckInEtaBinNo(Int_t const crossCheckInEtaBinNo) {this->fCrossCheckInEtaBinNo = crossCheckInEtaBinNo;};
+  Int_t GetCrossCheckInEtaBinNo() const {return this->fCrossCheckInEtaBinNo;};
+  void SetDiffFlowDirectCorrelations(TProfile* const diffFlowDirectCorrelations,Int_t i,Int_t j,Int_t k){this->fDiffFlowDirectCorrelations[i][j][k]=diffFlowDirectCorrelations;};
+  TProfile* GetDiffFlowDirectCorrelations(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowDirectCorrelations[i][j][k];};
+  void SetDiffFlowDirectCorrectionTermsForNUA(TProfile* const dfdctfn, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowDirectCorrectionTermsForNUA[i][j][k][l] = dfdctfn;};
+  TProfile* GetDiffFlowDirectCorrectionTermsForNUA(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowDirectCorrectionTermsForNUA[i][j][k][l];};  
+        
  private:
-  AliFlowAnalysisWithQCumulants(const AliFlowAnalysisWithQCumulants& afawQc);
-  AliFlowAnalysisWithQCumulants& operator=(const AliFlowAnalysisWithQCumulants& afawQc);
-  
-  AliFlowTrackSimple* fTrack;                           //track
-  TList*              fHistList;                        //list to hold all output histograms
-  TList*              fDiffFlowList;                    //list to hold all histograms and profiles needed for differential flow
-  TList*              fWeightsList;                     //list to hold all histograms with weights
-  TList*              fResultsList;                         // list to hold all histograms with results
-    
-  TProfile*           fAvMultIntFlowQC;                 //average selected multiplicity (for int. flow)
-  TProfile*           fQvectorComponents;               //averages of Q-vector components (1st bin: <Q_x>, 2nd bin: <Q_y>, ...)
-            
-  TH1D*               fDiffFlowResults2ndOrderQC;       //differential flow results from 2nd order Q-cumulant
-  TH1D*               fDiffFlowResults4thOrderQC;       //differential flow results from 4th order Q-cumulant
-  TH1D*               fCovariances;                     //final results for covariances: 1st bin: <2*4>-<2>*<4>, 2nd bin: <2*6>-<2>*<6>, ...
-  
-  TProfile*                  fQvectorForEachEventX;     //profile containing the x-components of Q-vectors from all events (to be removed)  
-  TProfile*                  fQvectorForEachEventY;     //profile containing the y-components of Q-vectors from all events (to be removed)   
-  TProfile*                  fQCorrelations;            //multi-particle correlations calculated from Q-vectors 
-  TProfile*                  fQCorrelationsW;           //weighted multi-particle correlations calculated from Q-vectors 
-  TProfile*                  fQProduct;                 //average of products: 1st bin: <2*4>, 2nd bin: <2*6>, ...
-  
-  TProfile*          fDirectCorrelations;               // multi-particle correlations calculated with nested loop needed for int. flow 
-  TProfile*          fDirectCorrelationsW;              // multi-particle correlations calculated with nested loop needed for weighted int. flow
-  TProfile*          fDirectCorrelationsDiffFlow;       // multi-particle correlations calculated with nested loop needed for diff. flow
-  TProfile*          fDirectCorrelationsDiffFlowW;      // multi-particle correlations calculated with nested loop needed for weighted int. flow
-  
-  // POI (Particles Of Interest):
-  // non-weighted correlations
-  TProfile*                  f2PerPtBin1n1nPOI;         //<<2'>>_{n|n} per pt-bin
-  TProfile*                  f4PerPtBin1n1n1n1nPOI;     //<<4'>>_{n,n|n,n} per pt-bin
-
-  TProfile*                  f2PerEtaBin1n1nPOI;        //<<2'>>_{n|n} per eta-bin
-  TProfile*                  f4PerEtaBin1n1n1n1nPOI;    //<<4'>>_{n,n|n,n} per eta-bin  
-  // weighted correlations
-  TProfile*                  f2WPerPtBin1n1nPOI;        //<<2'>>_{n|n} per eta-bin
-  TProfile*                  f4WPerPtBin1n1n1n1nPOI;    //<<4'>>_{n,n|n,n} per eta-bin    
-  
-  TProfile*                  f2WPerEtaBin1n1nPOI;       //<<2'>>_{n|n} per eta-bin 
-  TProfile*                  f4WPerEtaBin1n1n1n1nPOI;   //<<4'>>_{n,n|n,n} per eta-bin
-  
-  // RP (Reaction Plane particles)
-  // non-weighted correlations
-  TProfile*                  f2PerPtBin1n1nRP;          //<<2'>>_{n|n} per pt-bin
-  TProfile*                  f4PerPtBin1n1n1n1nRP;      //<<4'>>_{n,n|n,n} per pt-bin
-
-  TProfile*                  f2PerEtaBin1n1nRP;         //<<2'>>_{n|n} per eta-bin
-  TProfile*                  f4PerEtaBin1n1n1n1nRP;     //<<4'>>_{n,n|n,n} per eta-bin  
-  // weighted correlations
-  TProfile*                  f2WPerPtBin1n1nRP;         //<<2'>>_{n|n} per eta-bin 
-  TProfile*                  f4WPerPtBin1n1n1n1nRP;     //<<4'>>_{n,n|n,n} per eta-bin
   
-  TProfile*                  f2WPerEtaBin1n1nRP;        //<<2'>>_{n|n} per eta-bin 
-  TProfile*                  f4WPerEtaBin1n1n1n1nRP;    //<<4'>>_{n,n|n,n} per eta-bin
-  
-  AliFlowCommonHist*         fCommonHists2nd;           //common control histograms (taking into account only the events with 2 and more particles) 
-  AliFlowCommonHist*         fCommonHists4th;           //common control histograms (taking into account only the events with 4 and more particles) 
-  AliFlowCommonHist*         fCommonHists6th;           //common control histograms (taking into account only the events with 6 and more particles) 
-  AliFlowCommonHist*         fCommonHists8th;           //common control histograms (taking into account only the events with 8 and more particles) 
-  
-  AliFlowCommonHistResults*  fCommonHistsResults2nd;    //final results for 2nd order int. and diff. flow stored in the common histograms 
-  AliFlowCommonHistResults*  fCommonHistsResults4th;    //final results for 4th order int. and diff. flow stored in the common histograms 
-  AliFlowCommonHistResults*  fCommonHistsResults6th;    //final results for 6th order int. and diff. flow stored in the common histograms
-  AliFlowCommonHistResults*  fCommonHistsResults8th;    //final results for 8th order int. and diff. flow stored in the common histograms
-      
-  TH1D*                      f2pDistribution;           //distribution of <2>_{n|n}
-  TH1D*                      f4pDistribution;           //distribution of <4>_{n,n|n,n}
-  TH1D*                      f6pDistribution;           //distribution of <6>_{n,n,n|n,n,n} 
-  TH1D*                      f8pDistribution;           //distribution of <8>_{n,n,n,n|n,n,n,n}
-  Int_t                      fnBinsPt;                  //number of pt bins
-  Double_t                   fPtMin;                    //minimum pt   
-  Double_t                   fPtMax;                    //maximum pt    
-  
-  Int_t                      fnBinsEta;                 //number of eta bins
-  Double_t                   fEtaMin;                   //minimum eta   
-  Double_t                   fEtaMax;                   //maximum eta
-  Int_t                      fEventCounter;             //counting the number of events    
-   
-  Bool_t                     fUsePhiWeights;            // phi weights
-  Bool_t                     fUsePtWeights;             // pt weights
-  Bool_t                     fUseEtaWeights;            // eta weights
-  Bool_t                     fUseWeights;               // use phi || pt || eta weights
-  TBits*                     fUseWeightsBits;           // use phi || pt || eta weights 
-  
-  // ...................................................................................................................  
-  // Q_{n,k} and S^M_{n,k}:        
-  TMatrixD *fReQ;  // real part of the Q-vectors stored in matrix fReQ[n][k] = sum_{i=1}^{M} w_{i}^{k} cos(n phi_{i})
-  TMatrixD *fImQ;  // imaginary part of the Q-vectors stored in matrix fImQ[n][k] = sum_{i=1}^{M} w_{i}^{k} sin(n phi_{i})
+  AliFlowAnalysisWithQCumulants(const AliFlowAnalysisWithQCumulants& afawQc);
+  AliFlowAnalysisWithQCumulants& operator=(const AliFlowAnalysisWithQCumulants& afawQc); 
+  
+  // 0.) base:
+  TList* fHistList; // base list to hold all output object
+  
+  // 1.) common:
+  AliFlowCommonHist *fCommonHists; // common control histograms (taking into account ALL events) 
+  AliFlowCommonHist *fCommonHists2nd; // common control histograms (taking into account only the events with 2 and more particles) 
+  AliFlowCommonHist *fCommonHists4th; // common control histograms (taking into account only the events with 4 and more particles) 
+  AliFlowCommonHist *fCommonHists6th; // common control histograms (taking into account only the events with 6 and more particles) 
+  AliFlowCommonHist *fCommonHists8th; // common control histograms (taking into account only the events with 8 and more particles) 
+  AliFlowCommonHistResults *fCommonHistsResults2nd; // final results for 2nd order int. and diff. flow for events with 2 and more particles
+  AliFlowCommonHistResults *fCommonHistsResults4th; // final results for 4th order int. and diff. flow for events with 4 and more particles 
+  AliFlowCommonHistResults *fCommonHistsResults6th; // final results for 6th order int. and diff. flow for events with 6 and more particles
+  AliFlowCommonHistResults *fCommonHistsResults8th; // final results for 8th order int. and diff. flow for events with 8 and more particles
+  Int_t fnBinsPhi; // number of phi bins
+  Double_t fPhiMin; // minimum phi   
+  Double_t fPhiMax; // maximum phi 
+  Double_t fPhiBinWidth; // bin width for phi histograms  
+  Int_t fnBinsPt; // number of pt bins
+  Double_t fPtMin; // minimum pt   
+  Double_t fPtMax; // maximum pt  
+  Double_t fPtBinWidth; // bin width for pt histograms  
+  Int_t fnBinsEta; // number of eta bins
+  Double_t fEtaMin; // minimum eta   
+  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
+  Bool_t fUsePhiWeights; // use phi weights
+  Bool_t fUsePtWeights; // use pt weights
+  Bool_t fUseEtaWeights; // use eta weights
+  TProfile *fUseParticleWeights; // profile with three bins to hold values of fUsePhiWeights, fUsePtWeights and fUseEtaWeights
+  TH1F *fPhiWeights; // histogram holding phi weights
+  TH1D *fPtWeights; // histogram holding phi weights
+  TH1D *fEtaWeights; // histogram holding phi weights 
+  
+  // 3.) integrated flow       
+  //  3a.) lists:
+  TList *fIntFlowList; // list to hold all histograms and profiles relevant for integrated flow 
+  TList *fIntFlowProfiles; // list to hold all profiles relevant for integrated flow
+  TList *fIntFlowResults; // list to hold all histograms with final results relevant for integrated flow  
+  //  3b.) flags:
+  TProfile *fIntFlowFlags; // profile to hold all flags for integrated flow
+  Bool_t fApplyCorrectionForNUA; // apply correction for non-uniform acceptance
+  //  3c.) event-by-event quantities:
+  TMatrixD *fReQ; // fReQ[m][k] = sum_{i=1}^{M} w_{i}^{k} cos(m*phi_{i})
+  TMatrixD *fImQ; // fImQ[m][k] = sum_{i=1}^{M} w_{i}^{k} sin(m*phi_{i})
   TMatrixD *fSMpk; // fSM[p][k] = (sum_{i=1}^{M} w_{i}^{k})^{p}
-  
-  // q_{n} (POIs):
-  TH2D *fReqnPtEta; // real part of q_n (q_n is a Q-vector evaluated only for POIs in harmonic n for each (pt,eta) bin)  
-  TH2D *fImqnPtEta; // imaginary part of q_n (q_n is a Q-vector evaluated only for POIs in harmonic n for each (pt,eta) bin)
-  TH2D *fmPtEta;    // # of POIs (m) for each (pt,eta) bin  
-  
-  // non-weighted q''_{n} and q''_{2n} (both POIs and RPs)
-  TH2D *fReqPrimePrime1nPtEta; // real part of q''_{n} for each (pt,eta) bin  
-  TH2D *fImqPrimePrime1nPtEta; // imaginary part of q''_{n} for each (pt,eta) bin 
-  TH2D *fReqPrimePrime2nPtEta; // real part of q''_{2n} for each (pt,eta) bin
-  TH2D *fImqPrimePrime2nPtEta; // imaginary part of q''_{2n} for each (pt,eta) bin
-  
-  // weighted q''_{n,2k} and q''_{2n,k} (both POIs and RPs)
-  TH2D *fReqPrimePrime1n2kPtEta; // real part of q''_{n,2k} for each (pt,eta) bin  
-  TH2D *fImqPrimePrime1n2kPtEta; // imaginary part of q''_{n,2k} for each (pt,eta) bin  
-  TH2D *fReqPrimePrime2n1kPtEta; // real part of q''_{2n,k} for each (pt,eta) bin 
-  TH2D *fImqPrimePrime2n1kPtEta; // imaginary part of q''_{2n,k} for each (pt,eta) bin 
-  
-  // m'' (both POIs and RPs) :
-  TH2D *fmPrimePrimePtEta; // # of particles which are both POIs and RPs for each (pt,eta) bin
-  
-  // S^{m''}_{p,k} (both POIs and RPs):
-  TH2D *fSmPrimePrime1p1kPtEta; // pow(sum_{i=1}^{m''} w_{i} cos(n phi_{i}), 1)
-  TH2D *fSmPrimePrime1p2kPtEta; // pow(sum_{i=1}^{m''} w_{i}^{2} cos(n phi_{i}), 1)
-  TH2D *fSmPrimePrime1p3kPtEta; // pow(sum_{i=1}^{m''} w_{i}^{3} cos(n phi_{i}), 1)
-  
-  // non-weighted q_RP{n} and q_RP{2n} (for each (pt,eta) bin for RPs)
-  TH2D *fReqRP1nPtEta; // real part of q_RP{n} (q_RP{n} is a Q-vector evaluated only for RPs in harmonic n for each (pt,eta) bin)
-  TH2D *fImqRP1nPtEta; // imaginary part of q_RP{n} (q_RP{n} is a Q-vector evaluated only for RPs in harmonic n for each (pt,eta) bin)
-  TH2D *fReqRP2nPtEta; // real part of q_RP{2n} (q_RP{2n} is a Q-vector evaluated only for RPs in harmonic 2n for each (pt,eta) bin)
-  TH2D *fImqRP2nPtEta; // imaginary part of q_RP{2n} (q_RP{2n} is a Q-vector evaluated only for RPs in harmonic 2n for each (pt,eta) bin)
-  
-  // weighted q_RP{n,2k} and q_RP{2n,k} (for each (pt,eta) bin for RPs)
-  TH2D *fReqRP1n2kPtEta; // real part of q_RP{n,2k} for each (pt,eta) bin  
-  TH2D *fImqRP1n2kPtEta; // imaginary part of q_RP{n,2k} for each (pt,eta) bin  
-  TH2D *fReqRP2n1kPtEta; // real part of q_RP{2n,k} for each (pt,eta) bin 
-  TH2D *fImqRP2n1kPtEta; // imaginary part of q_RP{2n,k} for each (pt,eta) bin 
-  
-  // m_RP:
-  TH2D *fmRPPtEta; // # of particles which are RPs for each (pt,eta) bin
-  
-  // S^{m_RP}_{p,k} (for each (pt,eta) bin for RPs):
-  TH2D *fSmRP1p1kPtEta; // pow(sum_{i=1}^{m_RP} w_{i} cos(n phi_{i}), 1)
-  TH2D *fSmRP1p2kPtEta; // pow(sum_{i=1}^{m_RP} w_{i}^{2} cos(n phi_{i}), 1)
-  TH2D *fSmRP1p3kPtEta; // pow(sum_{i=1}^{m_RP} w_{i}^{3} cos(n phi_{i}), 1)
-  
-  // ----- RESULTS ----
-  
-  // non-weighted integrated flow:
-  TH1D *fIntFlowResultsQC;     // final results for non-weighted no-name integrated flow
-  TH1D *fIntFlowResultsPOIQC;  // final results for non-weighted POIs integrated flow
-  TH1D *fIntFlowResultsRPQC;   // final results for non-weighted RPs integrated flow
-  
-  // weighted integrated flow:
-  TH1D *fIntFlowResultsQCW;    // final results for weighted no-name integrated flow
-  TH1D *fIntFlowResultsPOIQCW; // final results for weighted POIs integrated flow
-  TH1D *fIntFlowResultsRPQCW;  // final results for weighted RPs integrated flow
-  
-  // non-weighted correlations for each (pt,eta) bin for POIs:
-  TProfile2D *f2pPtEtaPOI; // <cos n(psi1-phi2)> for POIs
-  TProfile2D *f4pPtEtaPOI; // <cos n(psi1+phi2-phi3-phi4)> for POIs 
-  TProfile2D *f6pPtEtaPOI; // <cos n(psi1+phi2+phi3-phi4-phi5-phi6)> for POIs 
-  TProfile2D *f8pPtEtaPOI; // <cos n(psi1+phi2+phi3+phi4-phi5-phi6-phi7-phi8)> for POIs 
-  
-  // non-weighted final results for differential flow for POIs:
-  // 3D (pt,eta):
-  TH2D *fvn2ndPtEtaPOI; // v'_{n}{2,QC} (pt,eta) for POIs
-  TH2D *fvn4thPtEtaPOI; // v'_{n}{4,QC} (pt,eta) for POIs
-  TH2D *fvn6thPtEtaPOI; // v'_{n}{6,QC} (pt,eta) for POIs
-  TH2D *fvn8thPtEtaPOI; // v'_{n}{8,QC} (pt,eta) for POIs
-  // 2D (pt):
-  TH1D *fvn2ndPtPOI; // v'_{n}{2,QC} (pt) for POIs
-  TH1D *fvn4thPtPOI; // v'_{n}{4,QC} (pt) for POIs
-  TH1D *fvn6thPtPOI; // v'_{n}{6,QC} (pt) for POIs
-  TH1D *fvn8thPtPOI; // v'_{n}{8,QC} (pt) for POIs
-  // 2D (eta):
-  TH1D *fvn2ndEtaPOI; // v'_{n}{2,QC} (eta) for POIs
-  TH1D *fvn4thEtaPOI; // v'_{n}{4,QC} (eta) for POIs
-  TH1D *fvn6thEtaPOI; // v'_{n}{6,QC} (eta) for POIs
-  TH1D *fvn8thEtaPOI; // v'_{n}{8,QC} (eta) for POIs
-
-  // weighted correlations for each (pt,eta) bin for POIs:
-  TProfile2D *f2pPtEtaPOIW; // <w2 cos n(psi1-phi2)> for POIs
-  TProfile2D *f4pPtEtaPOIW; // <w2 w3 w4 cos n(psi1+phi2-phi3-phi4)> for POIs 
-  TProfile2D *f6pPtEtaPOIW; // <w2 w3 w4 w5 w6 cos n(psi1+phi2+phi3-phi4-phi5-phi6)> for POIs 
-  TProfile2D *f8pPtEtaPOIW; // <w2 w3 w4 w5 w6 w7 w8 cos n(psi1+phi2+phi3+phi4-phi5-phi6-phi7-phi8)> for POIs 
-  
-  // weighted final results for differential flow  for POIs:
-  // 3D (pt,eta):
-  TH2D *fvn2ndPtEtaPOIW; // v'_{n}{2,QC} (pt,eta) for POIs
-  TH2D *fvn4thPtEtaPOIW; // v'_{n}{4,QC} (pt,eta) for POIs
-  TH2D *fvn6thPtEtaPOIW; // v'_{n}{6,QC} (pt,eta) for POIs
-  TH2D *fvn8thPtEtaPOIW; // v'_{n}{8,QC} (pt,eta) for POIs
-  // 2D (pt):
-  TH1D *fvn2ndPtPOIW; // v'_{n}{2,QC} (pt) for POIs
-  TH1D *fvn4thPtPOIW; // v'_{n}{4,QC} (pt) for POIs
-  TH1D *fvn6thPtPOIW; // v'_{n}{6,QC} (pt) for POIs
-  TH1D *fvn8thPtPOIW; // v'_{n}{8,QC} (pt) for POIs
-  // 2D (eta):
-  TH1D *fvn2ndEtaPOIW; // v'_{n}{2,QC} (eta) for POIs
-  TH1D *fvn4thEtaPOIW; // v'_{n}{4,QC} (eta) for POIs
-  TH1D *fvn6thEtaPOIW; // v'_{n}{6,QC} (eta) for POIs
-  TH1D *fvn8thEtaPOIW; // v'_{n}{8,QC} (eta) for POIs
-  
-  // non-weighted correlations for each (pt,eta) bin for RPs:
-  TProfile2D *f2pPtEtaRP; // <cos n(psi1-phi2)> for RPs
-  TProfile2D *f4pPtEtaRP; // <cos n(psi1+phi2-phi3-phi4)> for RPs 
-  TProfile2D *f6pPtEtaRP; // <cos n(psi1+phi2+phi3-phi4-phi5-phi6)> for RPs 
-  TProfile2D *f8pPtEtaRP; // <cos n(psi1+phi2+phi3+phi4-phi5-phi6-phi7-phi8)> for RPs
-  
-  // non-weighted final results for differential flow for RPs:
-  // 3D (pt,eta):
-  TH2D *fvn2ndPtEtaRP; // v'_{n}{2,QC} (pt,eta) for RPs
-  TH2D *fvn4thPtEtaRP; // v'_{n}{4,QC} (pt,eta) for RPs
-  TH2D *fvn6thPtEtaRP; // v'_{n}{6,QC} (pt,eta) for RPs
-  TH2D *fvn8thPtEtaRP; // v'_{n}{8,QC} (pt,eta) for RPs
-  // 2D (pt):
-  TH1D *fvn2ndPtRP; // v'_{n}{2,QC} (pt) for RPs
-  TH1D *fvn4thPtRP; // v'_{n}{4,QC} (pt) for RPs
-  TH1D *fvn6thPtRP; // v'_{n}{6,QC} (pt) for RPs
-  TH1D *fvn8thPtRP; // v'_{n}{8,QC} (pt) for RPs
-  // 2D (eta):
-  TH1D *fvn2ndEtaRP; // v'_{n}{2,QC} (eta) for RPs
-  TH1D *fvn4thEtaRP; // v'_{n}{4,QC} (eta) for RPs
-  TH1D *fvn6thEtaRP; // v'_{n}{6,QC} (eta) for RPs
-  TH1D *fvn8thEtaRP; // v'_{n}{8,QC} (eta) for RPs
-  // weighted correlations for each (pt,eta) bin for RPs:
-  TProfile2D *f2pPtEtaRPW; // <w2 cos n(psi1-phi2)> for RPs
-  TProfile2D *f4pPtEtaRPW; // <w2 w3 w4 cos n(psi1+phi2-phi3-phi4)> for RPs 
-  TProfile2D *f6pPtEtaRPW; // <w2 w3 w4 w5 w6 cos n(psi1+phi2+phi3-phi4-phi5-phi6)> for RPs 
-  TProfile2D *f8pPtEtaRPW; // <w2 w3 w4 w5 w6 w7 w8 cos n(psi1+phi2+phi3+phi4-phi5-phi6-phi7-phi8)> for RPs 
-  
-  // weighted final results for differential flow for RPs:
-  // 3D (pt,eta):
-  TH2D *fvn2ndPtEtaRPW; // v'_{n}{2,QC} (pt,eta) for RPs
-  TH2D *fvn4thPtEtaRPW; // v'_{n}{4,QC} (pt,eta) for RPs
-  TH2D *fvn6thPtEtaRPW; // v'_{n}{6,QC} (pt,eta) for RPs
-  TH2D *fvn8thPtEtaRPW; // v'_{n}{8,QC} (pt,eta) for RPs
-  // 2D (pt):
-  TH1D *fvn2ndPtRPW; // v'_{n}{2,QC} (pt) for RPs
-  TH1D *fvn4thPtRPW; // v'_{n}{4,QC} (pt) for RPs
-  TH1D *fvn6thPtRPW; // v'_{n}{6,QC} (pt) for RPs
-  TH1D *fvn8thPtRPW; // v'_{n}{8,QC} (pt) for RPs
-  // 2D (eta):
-  TH1D *fvn2ndEtaRPW; // v'_{n}{2,QC} (eta) for RPs
-  TH1D *fvn4thEtaRPW; // v'_{n}{4,QC} (eta) for RPs
-  TH1D *fvn6thEtaRPW; // v'_{n}{6,QC} (eta) for RPs
-  TH1D *fvn8thEtaRPW; // v'_{n}{8,QC} (eta) for RPs
-  // ...................................................................................................................
-  
-  
-  
-                       
+  TH1D *fIntFlowCorrelationsEBE; // 1st bin: <2>, 2nd bin: <4>, 3rd bin: <6>, 4th bin: <8>
+  TH1D *fIntFlowEventWeightsForCorrelationsEBE; // 1st bin: eW_<2>, 2nd bin: eW_<4>, 3rd bin: eW_<6>, 4th bin: eW_<8>
+  TH1D *fIntFlowCorrelationsAllEBE; // to be improved (add comment)
+  TH1D *fIntFlowCorrectionTermsForNUAEBE[2]; // [0=sin terms,1=cos terms], NUA = non-uniform acceptance
+  //  3d.) profiles:
+  TProfile *fAvMultiplicity; // profile to hold average multiplicities and number of events for events with nRP>=0, nRP>=1, ... , and nRP>=8
+  TProfile *fIntFlowCorrelationsPro; // average correlations <<2>>, <<4>>, <<6>> and <<8>> (with wrong errors!) 
+  TProfile *fIntFlowCorrelationsAllPro; // average all correlations for integrated flow (with wrong errors!)
+  TProfile *fIntFlowExtraCorrelationsPro; // when particle weights are used some extra correlations appear 
+  TProfile *fIntFlowProductOfCorrelationsPro; // average product of correlations <2>, <4>, <6> and <8>:  
+  TProfile *fIntFlowCorrectionTermsForNUAPro[2]; // average correction terms for non-uniform acceptance (with wrong errors!) [0=sin terms,1=cos terms] 
+  //  3e.) histograms with final results:
+  TH1D *fIntFlowCorrelationsHist; // final results for average correlations <<2>>, <<4>>, <<6>> and <<8>> (with correct errors!) 
+  TH1D *fIntFlowCorrelationsAllHist; // final results for all average correlations (with correct errors!) 
+  TH1D *fIntFlowCorrectionTermsForNUAHist[2];// final results for correction terms for non-uniform acceptance (with correct errors!) [0=sin terms,1=cos terms]
+  TH1D *fIntFlowCovariances; // final result for covariances of correlations (multiplied with weight dependent prefactor)
+  TH1D *fIntFlowSumOfEventWeights[2]; // sum of linear and quadratic event weights for <2>, <4>, <6> and <8>: [0=linear 1,1=quadratic]
+  TH1D *fIntFlowSumOfProductOfEventWeights; // sum of products of event weights for correlations <2>, <4>, <6> and <8>
+  TH1D *fIntFlowQcumulants; // final results for integrated Q-cumulants QC{2}, QC{4}, QC{6} and QC{8}
+  TH1D *fIntFlow; // final results for integrated flow estimates v_n{2,QC}, v_n{4,QC}, v_n{6,QC} and v_n{8,QC}
+     
+  // 4.) differential flow
+  //  4a.) lists:
+  TList *fDiffFlowList; // list to hold list with all histograms (fDiffFlowResults) and list with profiles (fDiffFlowProfiles) relevant for differential flow 
+  TList *fDiffFlowProfiles; // list to hold all profiles relevant for differential flow
+  TList *fDiffFlowResults; // list to hold all histograms with final results relevant for differential flow  
+  //    4aa.) nested list in list fDiffFlowProfiles: 
+  TList *fDiffFlowCorrelationsProList[2][2]; // list to hold profiles with all correlations for differential flow [0=RP,1=POI][0=pt,1=eta] 
+  TList *fDiffFlowProductOfCorrelationsProList[2][2]; // list to hold profiles with products of all correlations for differential flow [0=RP,1=POI][0=pt,1=eta] 
+  TList *fDiffFlowCorrectionsProList[2][2]; // list to hold profiles with correction term for NUA for differential flow [0=RP,1=POI][0=pt,1=eta] 
+  //    4ab.) nested list in list fDiffFlowResults: 
+  TList *fDiffFlowCorrelationsHistList[2][2]; // list to hold histograms with all correlations for differential flow [0=RP,1=POI][0=pt,1=eta] 
+  TList *fDiffFlowSumOfEventWeightsHistList[2][2][2]; // list to hold histograms with sum of linear/quadratic event weights [0=RP,1=POI][0=pt,1=eta][0=linear 1,1=quadratic]
+  TList *fDiffFlowSumOfProductOfEventWeightsHistList[2][2]; // list to hold histograms with sum of products of event weights [0=RP,1=POI][0=pt,1=eta]
+  TList *fDiffFlowCorrectionsHistList[2][2]; // list to hold histograms with correction term for NUA for differential flow [0=RP,1=POI][0=pt,1=eta] 
+  TList *fDiffFlowCovariancesHistList[2][2]; // list to hold histograms with all covariances for differential flow [0=RP,1=POI][0=pt,1=eta] 
+  TList *fDiffFlowCumulantsHistList[2][2]; // list to hold histograms with all cumulants for differential flow [0=RP,1=POI][0=pt,1=eta] 
+  TList *fDiffFlowHistList[2][2]; // list to hold histograms with final results for differential flow [0=RP,1=POI][0=pt,1=eta]
+  //  4b.) flags:  
+  TProfile *fDiffFlowFlags; // profile to hold all flags for differential flow
+  Bool_t fCalculate2DFlow; // calculate differential flow in (pt,eta) (Remark: this is very expensive in terms of CPU time)
+  //  4c.) event-by-event quantities:
+  // 1D:
+  TProfile *fReRPQ1dEBE[3][2][4][9]; // real part [0=r,1=p,2=q][0=pt,1=eta][m][k]
+  TProfile *fImRPQ1dEBE[3][2][4][9]; // imaginary part [0=r,1=p,2=q][0=pt,1=eta][m][k]
+  TProfile *fs1dEBE[3][2][9]; // [0=r,1=p,2=q][0=pt,1=eta][k] // to be improved
+  TH1D *fDiffFlowCorrelationsEBE[2][2][4]; // [0=RP,1=POI][0=pt,1=eta][reduced correlation index]
+  TH1D *fDiffFlowEventWeightsForCorrelationsEBE[2][2][4]; // [0=RP,1=POI][0=pt,1=eta][event weights for reduced correlation index]
+  TH1D *fDiffFlowCorrectionTermsForNUAEBE[2][2][2][10]; // [0=RP,1=POI][0=pt,1=eta][0=sin terms,1=cos terms][correction term index]
+  // 2D:
+  TProfile2D *fReRPQ2dEBE[3][4][9]; // real part of r_{m*n,k}(pt,eta), p_{m*n,k}(pt,eta) and q_{m*n,k}(pt,eta)
+  TProfile2D *fImRPQ2dEBE[3][4][9]; // imaginary part of r_{m*n,k}(pt,eta), p_{m*n,k}(pt,eta) and q_{m*n,k}(pt,eta)
+  TProfile2D *fs2dEBE[3][9]; // [t][k] // to be improved
+  //  4d.) profiles:
+  // 1D:
+  TProfile *fDiffFlowCorrelationsPro[2][2][4]; // [0=RP,1=POI][0=pt,1=eta][correlation index]
+  TProfile *fDiffFlowProductOfCorrelationsPro[2][2][8][8]; // [0=RP,1=POI][0=pt,1=eta] [0=<2>,1=<2'>,2=<4>,3=<4'>,4=<6>,5=<6'>,6=<8>,7=<8'>] x 
+                                                           //                          [0=<2>,1=<2'>,2=<4>,3=<4'>,4=<6>,5=<6'>,6=<8>,7=<8'>]
+  TProfile *fDiffFlowCorrectionTermsForNUAPro[2][2][2][10]; // [0=RP,1=POI][0=pt,1=eta][0=sin terms,1=cos terms][correction term index]
+                                                              
+  //  4e.) histograms holding final results:
+  // 1D:
+  TH1D *fDiffFlowCorrelationsHist[2][2][4]; // [0=RP,1=POI][0=pt,1=eta][correlation index]
+  TH1D *fDiffFlowCovariances[2][2][5]; // [0=RP,1=POI][0=pW not used,1=pW used][0=exact eW,1=non-exact eW][0=pt,1=eta][index of covariances] 
+  TH1D *fDiffFlowCumulants[2][2][4]; // [0=RP,1=POI][0=pt,1=eta][0=QC{2'},1=QC{4'},2=QC{6'},3=QC{8'}]
+  TH1D *fDiffFlow[2][2][4]; // [0=RP,1=POI][0=pt,1=eta][0=v'{2},1=v'{4},2=v'{6},3=v'{8}]
+  TH1D *fDiffFlowSumOfEventWeights[2][2][2][4]; // [0=RP,1=POI][0=pt,1=eta][0=linear 1,1=quadratic][0=<2'>,1=<4'>,2=<6'>,3=<8'>]
+  TH1D *fDiffFlowSumOfProductOfEventWeights[2][2][8][8]; // [0=RP,1=POI][0=pt,1=eta]  [0=<2>,1=<2'>,2=<4>,3=<4'>,4=<6>,5=<6'>,6=<8>,7=<8'>] x 
+                                                         //                           [0=<2>,1=<2'>,2=<4>,3=<4'>,4=<6>,5=<6'>,6=<8>,7=<8'>]
+  TH1D *fDiffFlowCorrectionTermsForNUAHist[2][2][2][10]; // [0=RP,1=POI][0=pt,1=eta][0=sin terms,1=cos terms][correction term index]
+       
+  // 2D:
+  TProfile2D *fCorrelationsPro[2][2][2][4]; // [0=RP,1=POI][0=pWeights not used,1=pWeights used][0=exact eWeights,1=non-exact eWeights][corr.'s index]
+  TProfile2D *fProductsOfCorrelationsPro[2][2][2][5]; // [0=RP,1=POI][0=pW not used,1=pW used][0=exact eWeights,1=non-exact eWeights][products' index]
+  TProfile2D *fCorrectionTermsPro[2][2][2][2][2]; // [0=RP,1=POI][0=pW not used,1=pW used][0=e eW,1=ne eW][0=sin terms,1=cos terms][corr. terms' index]
+        
+  // 5.) distributions:
+  TList *fDistributionsList; // list to hold all distributions
+  TH1D *fDistributions[2][2][4]; // [0=pWeights not used,1=pWeights used][0=exact eWeights,1=non-exact eWeights][0=<2>,1=<4>,2=<6>,3=<8>]
+    
+  // x.) debugging and cross-checking:
+  TList *fNestedLoopsList; // list to hold all profiles filled with nested loops
+  Bool_t fEvaluateIntFlowNestedLoops; // evaluate nested loops relevant for integrated flow
+  Bool_t fEvaluateDiffFlowNestedLoops; // evaluate nested loops relevant for differential flow
+  Int_t fMaxAllowedMultiplicity; // nested loops will be evaluated only for events with multiplicity <= fMaxAllowedMultiplicity
+  TProfile *fEvaluateNestedLoops; // profile with four bins: fEvaluateIntFlowNestedLoops, fEvaluateDiffFlowNestedLoops, fCrossCheckInPtBinNo and fCrossCheckInEtaBinNo 
+  // integrated flow:
+  TProfile *fIntFlowDirectCorrelations; // multiparticle correlations relevant for int. flow calculated with nested loops  
+  TProfile *fIntFlowExtraDirectCorrelations; // when particle weights are used some extra correlations appear   
+  TProfile *fIntFlowDirectCorrectionTermsForNUA[2]; // average correction terms for non-uniform acceptance evaluated with nested loops [0=sin terms,1=cos terms] 
+  // differential flow:
+  Int_t fCrossCheckInPtBinNo; // cross-check results for reduced correlations and corrections in this pt bin
+  Int_t fCrossCheckInEtaBinNo; // cross-check results for reduced correlations and corrections in this eta bin
+  TProfile *fDiffFlowDirectCorrelations[2][2][4]; // [0=RP,1=POI][0=pt,1=eta][correlation index]
+  TProfile *fDiffFlowDirectCorrectionTermsForNUA[2][2][2][10]; // [0=RP,1=POI][0=pt,1=eta][0=sin terms,1=cos terms][correction term index]
+                  
   ClassDef(AliFlowAnalysisWithQCumulants, 0);
 };