adding some setters for multiplicity range

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
index d4ffe656a9572be8a6b2f5f9e8a5c3948a491e22..073d3f89353e64e5368aff9fae1fc74243d4cccc 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
@@ -114,8 +114,8 @@ AliFlowAnalysisWithQCumulants::AliFlowAnalysisWithQCumulants():
  fIntFlowFlags(NULL),
  fApplyCorrectionForNUA(kTRUE),  
  fnBinsMult(10000),
- fMinMult(0),  
- fMaxMult(10000), 
+ fMinMult(0.),  
+ fMaxMult(10000.), 
  fReQ(NULL),
  fImQ(NULL),
  fSMpk(NULL),
@@ -777,7 +777,7 @@ void AliFlowAnalysisWithQCumulants::Finish()
  if(fApplyCorrectionForNUA) // to be improved (reorganized, etc)
  {
   this->FinalizeCorrectionTermsForNUAIntFlow();
-  this->CalculateCovariancesNUAIntFlow();
+  // this->CalculateCovariancesNUAIntFlow(); // to be improved (enabled eventually)
   this->CalculateQcumulantsCorrectedForNUAIntFlow();   
   this->CalculateIntFlowCorrectedForNUA(); 
  }

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx
index 45aaad764b2d42ebc3b310864bd43b96674be0ad..aba4caacd9be491b33fb4b0011f070682a1409d2 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx
@@ -46,6 +46,9 @@ AliAnalysisTaskQCumulants::AliAnalysisTaskQCumulants(const char *name, Bool_t us
  fApplyCorrectionForNUA(kTRUE), 
  fCalculate2DFlow(kFALSE),
  fStoreDistributions(kFALSE),
+ fnBinsMult(10000),
+ fMinMult(0.),  
+ fMaxMult(10000.), 
  fUseParticleWeights(useParticleWeights),
  fUsePhiWeights(kFALSE),
  fUsePtWeights(kFALSE),
@@ -81,6 +84,9 @@ AliAnalysisTaskQCumulants::AliAnalysisTaskQCumulants():
  fApplyCorrectionForNUA(kFALSE), 
  fCalculate2DFlow(kFALSE),
  fStoreDistributions(kFALSE),
+ fnBinsMult(0),
+ fMinMult(0.),  
+ fMaxMult(0.), 
  fUseParticleWeights(kFALSE),
  fUsePhiWeights(kFALSE),
  fUsePtWeights(kFALSE),
@@ -107,6 +113,10 @@ void AliAnalysisTaskQCumulants::UserCreateOutputObjects()
  fQC->SetApplyCorrectionForNUA(fApplyCorrectionForNUA);
  fQC->SetCalculate2DFlow(fCalculate2DFlow);
  fQC->SetStoreDistributions(fStoreDistributions);
+ // multiparticle correlations vs multiplicity:
+ fQC->SetnBinsMult(fnBinsMult);
+ fQC->SetMinMult(fMinMult);
+ fQC->SetMaxMult(fMaxMult);
  // Particle weights:
  if(fUseParticleWeights)
  {

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h
index f44558f30b154e1f5f8323d72af5a151e8194940..4bde01d4280adfcb9de3ab028c973895b1a7df77 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h
@@ -46,6 +46,13 @@ class AliAnalysisTaskQCumulants : public AliAnalysisTaskSE{
   Bool_t GetCalculate2DFlow() const {return this->fCalculate2DFlow;};
   void SetStoreDistributions(Bool_t const storeDistributions) {this->fStoreDistributions = storeDistributions;};
   Bool_t GetStoreDistributions() const {return this->fStoreDistributions;};
+  // multiparticle correlations vs multiplicity:
+  void SetnBinsMult(Int_t const nbm) {this->fnBinsMult = nbm;};
+  Int_t GetnBinsMult() const {return this->fnBinsMult;};  
+  void SetMinMult(Double_t const minm) {this->fMinMult = minm;};
+  Double_t GetMinMult() const {return this->fMinMult;};
+  void SetMaxMult(Double_t const maxm) {this->fMaxMult = maxm;};
+  Double_t GetMaxMult() const {return this->fMaxMult;};
   // particle weights:
   void SetUsePhiWeights(Bool_t const uPhiW) {this->fUsePhiWeights = uPhiW;};
   Bool_t GetUsePhiWeights() const {return this->fUsePhiWeights;};
@@ -68,6 +75,10 @@ class AliAnalysisTaskQCumulants : public AliAnalysisTaskSE{
   Bool_t fApplyCorrectionForNUA;      // apply correction for non-uniform acceptance 
   Bool_t fCalculate2DFlow;            // calculate differential flow in (pt,eta) (Remark: this is very expensive in terms of CPU time)
   Bool_t fStoreDistributions;         // store or not distributions of correlations
+  // multiparticle correlations vs multiplicity:
+  Int_t fnBinsMult;                   // number of multiplicity bins for flow analysis versus multiplicity  
+  Double_t fMinMult;                  // minimal multiplicity for flow analysis versus multiplicity  
+  Double_t fMaxMult;                  // maximal multiplicity for flow analysis versus multiplicity    
   // particle weights:
   Bool_t fUseParticleWeights;         // use any particle weights
   Bool_t fUsePhiWeights;              // use phi weights

diff --git a/PWG2/FLOW/macros/AddTaskFlow.C b/PWG2/FLOW/macros/AddTaskFlow.C
index 41e6c73dc63056bd5d74d72b9d8cf6be3b1d74ea..be0da42c965d2c0c74280cab51f399942ebf74f0 100644 (file)
--- a/PWG2/FLOW/macros/AddTaskFlow.C
+++ b/PWG2/FLOW/macros/AddTaskFlow.C
@@ -700,6 +700,9 @@ AliAnalysisTaskFlowEvent* AddTaskFlow(TString type, Bool_t* METHODS, Bool_t QA,
     taskQC->SetUsePhiWeights(WEIGHTS[0]); 
     taskQC->SetUsePtWeights(WEIGHTS[1]);
     taskQC->SetUseEtaWeights(WEIGHTS[2]); 
+    taskQC->SetnBinsMult(10000);
+    taskQC->SetMinMult(0.);
+    taskQC->SetMaxMult(10000.);
     mgr->AddTask(taskQC);
   }
   if (FQD){