remove a number of histograms

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
index b929018690383613fb2f8c6c8909c8ff45a9b2a6..16848a3983ed5b3d22cdae89d745275fedf93520 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
@@ -92,6 +92,7 @@ AliFlowAnalysisWithQCumulants::AliFlowAnalysisWithQCumulants():
  fEtaMin(0),
  fEtaMax(0),
  fEtaBinWidth(0),
+ fFillMultipleControlHistograms(kFALSE),
  fHarmonic(2),
  fAnalysisLabel(NULL),
  // 2a.) particle weights:
@@ -116,7 +117,7 @@ AliFlowAnalysisWithQCumulants::AliFlowAnalysisWithQCumulants():
  fMinMult(0.),  
  fMaxMult(10000.), 
  fPropagateErrorAlsoFromNIT(kFALSE), 
- fCalculateCumulantsVsM(kTRUE), 
+  fCalculateCumulantsVsM(kFALSE),
  fMinimumBiasReferenceFlow(kTRUE), 
  fForgetAboutCovariances(kFALSE), 
  fStorePhiDistributionForOneEvent(kFALSE),
@@ -765,6 +766,7 @@ void AliFlowAnalysisWithQCumulants::Finish()
  fMinimumBiasReferenceFlow = (Bool_t)fIntFlowFlags->GetBinContent(11); 
  fForgetAboutCovariances = (Bool_t)fIntFlowFlags->GetBinContent(12);
  fStorePhiDistributionForOneEvent = (Bool_t)fIntFlowFlags->GetBinContent(13);
+ fFillMultipleControlHistograms = (Bool_t)fIntFlowFlags->GetBinContent(14);
  fEvaluateIntFlowNestedLoops = (Bool_t)fEvaluateNestedLoops->GetBinContent(1);
  fEvaluateDiffFlowNestedLoops = (Bool_t)fEvaluateNestedLoops->GetBinContent(2); 
  fCrossCheckInPtBinNo = (Int_t)fEvaluateNestedLoops->GetBinContent(3);
@@ -1063,10 +1065,8 @@ void AliFlowAnalysisWithQCumulants::CalculateIntFlowCorrectionsForNUASinTerms()
  
 } // end of AliFlowAnalysisWithQCumulants::CalculateIntFlowCorrectionsForNUASinTerms()
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::GetOutputHistograms(TList *outputListHistos)
 {
  // a) Get pointers for common control and common result histograms and profiles.
@@ -1100,10 +1100,8 @@ void AliFlowAnalysisWithQCumulants::GetOutputHistograms(TList *outputListHistos)
    
 } // end of void AliFlowAnalysisWithQCumulants::GetOutputHistograms(TList *outputListHistos)
 
-
 //================================================================================================================================
 
-
 TProfile* AliFlowAnalysisWithQCumulants::MakePtProjection(TProfile2D *profilePtEta) const
 {
  // project 2D profile onto pt axis to get 1D profile
@@ -1338,10 +1336,8 @@ void AliFlowAnalysisWithQCumulants::WriteHistograms(TDirectoryFile *outputFileNa
  outputFileName->Write(outputFileName->GetName(), TObject::kSingleKey);
 }
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::BookCommonHistograms()
 {
  // Book common control histograms and common histograms for final results.
@@ -1350,42 +1346,46 @@ void AliFlowAnalysisWithQCumulants::BookCommonHistograms()
  commonHistsName += fAnalysisLabel->Data();
  fCommonHists = new AliFlowCommonHist(commonHistsName.Data());
  fHistList->Add(fCommonHists);  
- // common control histogram (for events with 2 and more particles)
- TString commonHists2ndOrderName = "AliFlowCommonHist2ndOrderQC";
- commonHists2ndOrderName += fAnalysisLabel->Data();
- fCommonHists2nd = new AliFlowCommonHist(commonHists2ndOrderName.Data());
- fHistList->Add(fCommonHists2nd);  
- // common control histogram (for events with 4 and more particles)
- TString commonHists4thOrderName = "AliFlowCommonHist4thOrderQC";
- commonHists4thOrderName += fAnalysisLabel->Data();
- fCommonHists4th = new AliFlowCommonHist(commonHists4thOrderName.Data());
- fHistList->Add(fCommonHists4th);  
- // common control histogram (for events with 6 and more particles)
- TString commonHists6thOrderName = "AliFlowCommonHist6thOrderQC";
- commonHists6thOrderName += fAnalysisLabel->Data();
- fCommonHists6th = new AliFlowCommonHist(commonHists6thOrderName.Data());
- fHistList->Add(fCommonHists6th);  
- // common control histogram (for events with 8 and more particles)
- TString commonHists8thOrderName = "AliFlowCommonHist8thOrderQC";
- commonHists8thOrderName += fAnalysisLabel->Data();
- fCommonHists8th = new AliFlowCommonHist(commonHists8thOrderName.Data());
- fHistList->Add(fCommonHists8th);    
- // common histograms for final results (calculated for events with 2 and more particles)
+ if(fFillMultipleControlHistograms)
+ {
+  // common control histogram (for events with 2 and more particles)
+  TString commonHists2ndOrderName = "AliFlowCommonHist2ndOrderQC";
+  commonHists2ndOrderName += fAnalysisLabel->Data();
+  fCommonHists2nd = new AliFlowCommonHist(commonHists2ndOrderName.Data());
+  fHistList->Add(fCommonHists2nd);  
+  // common control histogram (for events with 4 and more particles)
+  TString commonHists4thOrderName = "AliFlowCommonHist4thOrderQC";
+  commonHists4thOrderName += fAnalysisLabel->Data();
+  fCommonHists4th = new AliFlowCommonHist(commonHists4thOrderName.Data());
+  fHistList->Add(fCommonHists4th);  
+  // common control histogram (for events with 6 and more particles)
+  TString commonHists6thOrderName = "AliFlowCommonHist6thOrderQC";
+  commonHists6thOrderName += fAnalysisLabel->Data();
+  fCommonHists6th = new AliFlowCommonHist(commonHists6thOrderName.Data());
+  fHistList->Add(fCommonHists6th);  
+  // common control histogram (for events with 8 and more particles)
+  TString commonHists8thOrderName = "AliFlowCommonHist8thOrderQC";
+  commonHists8thOrderName += fAnalysisLabel->Data();
+  fCommonHists8th = new AliFlowCommonHist(commonHists8thOrderName.Data());
+  fHistList->Add(fCommonHists8th);    
+ } // end of if(fFillMultipleControlHistograms)
+ 
+ // common histograms for final results for QC{2}:
  TString commonHistResults2ndOrderName = "AliFlowCommonHistResults2ndOrderQC";
  commonHistResults2ndOrderName += fAnalysisLabel->Data();
  fCommonHistsResults2nd = new AliFlowCommonHistResults(commonHistResults2ndOrderName.Data());
  fHistList->Add(fCommonHistsResults2nd);  
- // common histograms for final results (calculated for events with 4 and more particles)
+ // common histograms for final results for QC{4}:
  TString commonHistResults4thOrderName = "AliFlowCommonHistResults4thOrderQC";
  commonHistResults4thOrderName += fAnalysisLabel->Data();
  fCommonHistsResults4th = new AliFlowCommonHistResults(commonHistResults4thOrderName.Data());
  fHistList->Add(fCommonHistsResults4th); 
- // common histograms for final results (calculated for events with 6 and more particles)
+ // common histograms for final results for QC{6}:
  TString commonHistResults6thOrderName = "AliFlowCommonHistResults6thOrderQC";
  commonHistResults6thOrderName += fAnalysisLabel->Data();
  fCommonHistsResults6th = new AliFlowCommonHistResults(commonHistResults6thOrderName.Data());
  fHistList->Add(fCommonHistsResults6th);  
- // common histograms for final results (calculated for events with 8 and more particles)
+ // common histograms for final results for QC{8}:
  TString commonHistResults8thOrderName = "AliFlowCommonHistResults8thOrderQC";
  commonHistResults8thOrderName += fAnalysisLabel->Data();
  fCommonHistsResults8th = new AliFlowCommonHistResults(commonHistResults8thOrderName.Data());
@@ -1496,7 +1496,7 @@ void AliFlowAnalysisWithQCumulants::BookEverythingForIntegratedFlow()
  // a) Book profile to hold all flags for integrated flow:
  TString intFlowFlagsName = "fIntFlowFlags";
  intFlowFlagsName += fAnalysisLabel->Data();
- fIntFlowFlags = new TProfile(intFlowFlagsName.Data(),"Flags for Integrated Flow",13,0,13);
+ fIntFlowFlags = new TProfile(intFlowFlagsName.Data(),"Flags for Integrated Flow",14,0,14);
  fIntFlowFlags->SetTickLength(-0.01,"Y");
  fIntFlowFlags->SetMarkerStyle(25);
  fIntFlowFlags->SetLabelSize(0.05);
@@ -1514,6 +1514,7 @@ void AliFlowAnalysisWithQCumulants::BookEverythingForIntegratedFlow()
  fIntFlowFlags->GetXaxis()->SetBinLabel(11,"fMinimumBiasReferenceFlow");
  fIntFlowFlags->GetXaxis()->SetBinLabel(12,"fForgetAboutCovariances");
  fIntFlowFlags->GetXaxis()->SetBinLabel(13,"fStorePhiDistributionForOneEvent");
+ fIntFlowFlags->GetXaxis()->SetBinLabel(14,"fFillMultipleControlHistograms");
  fIntFlowList->Add(fIntFlowFlags);
 
  // b) Book event-by-event quantities:
@@ -5711,10 +5712,8 @@ void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCumulants(TString type, TSt
    
 } // end of void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCumulants(TString type, Bool_t useParticleWeights, TString eventWeights); 
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::CalculateFinalResultsForRPandPOIIntegratedFlow(TString type)
 {
  // calculate final results for integrated flow of RPs and POIs 
@@ -5744,17 +5743,35 @@ void AliFlowAnalysisWithQCumulants::CalculateFinalResultsForRPandPOIIntegratedFl
  
  if(type == "POI")
  {
-  yield2ndPt = (TH1F*)(fCommonHists2nd->GetHistPtPOI())->Clone();
-  yield4thPt = (TH1F*)(fCommonHists4th->GetHistPtPOI())->Clone();
-  yield6thPt = (TH1F*)(fCommonHists6th->GetHistPtPOI())->Clone();
-  yield8thPt = (TH1F*)(fCommonHists8th->GetHistPtPOI())->Clone();  
+  if(fFillMultipleControlHistograms)
+  {
+   yield2ndPt = (TH1F*)(fCommonHists2nd->GetHistPtPOI())->Clone();
+   yield4thPt = (TH1F*)(fCommonHists4th->GetHistPtPOI())->Clone();
+   yield6thPt = (TH1F*)(fCommonHists6th->GetHistPtPOI())->Clone();
+   yield8thPt = (TH1F*)(fCommonHists8th->GetHistPtPOI())->Clone();  
+  } else
+    {
+     yield2ndPt = (TH1F*)(fCommonHists->GetHistPtPOI())->Clone();
+     yield4thPt = (TH1F*)(fCommonHists->GetHistPtPOI())->Clone();
+     yield6thPt = (TH1F*)(fCommonHists->GetHistPtPOI())->Clone();
+     yield8thPt = (TH1F*)(fCommonHists->GetHistPtPOI())->Clone();     
+    }
  } 
  else if(type == "RP")
  {
-  yield2ndPt = (TH1F*)(fCommonHists2nd->GetHistPtRP())->Clone();
-  yield4thPt = (TH1F*)(fCommonHists4th->GetHistPtRP())->Clone();
-  yield6thPt = (TH1F*)(fCommonHists6th->GetHistPtRP())->Clone();
-  yield8thPt = (TH1F*)(fCommonHists8th->GetHistPtRP())->Clone();  
+  if(fFillMultipleControlHistograms)
+  {
+   yield2ndPt = (TH1F*)(fCommonHists2nd->GetHistPtRP())->Clone();
+   yield4thPt = (TH1F*)(fCommonHists4th->GetHistPtRP())->Clone();
+   yield6thPt = (TH1F*)(fCommonHists6th->GetHistPtRP())->Clone();
+   yield8thPt = (TH1F*)(fCommonHists8th->GetHistPtRP())->Clone();  
+  } else
+    {
+     yield2ndPt = (TH1F*)(fCommonHists->GetHistPtRP())->Clone();
+     yield4thPt = (TH1F*)(fCommonHists->GetHistPtRP())->Clone();
+     yield6thPt = (TH1F*)(fCommonHists->GetHistPtRP())->Clone();
+     yield8thPt = (TH1F*)(fCommonHists->GetHistPtRP())->Clone();    
+    } 
  } 
  
  Int_t nBinsPt = yield2ndPt->GetNbinsX();
@@ -7558,7 +7575,6 @@ void AliFlowAnalysisWithQCumulants::StoreIntFlowFlags()
      {
       fIntFlowFlags->Fill(1.5,2); // 2 = "multiplicity"        
      } 
- // corrected for non-uniform acceptance or not:
  fIntFlowFlags->Fill(2.5,(Int_t)fApplyCorrectionForNUA);
  fIntFlowFlags->Fill(3.5,(Int_t)fPrintFinalResults[0]);
  fIntFlowFlags->Fill(4.5,(Int_t)fPrintFinalResults[1]);
@@ -7570,6 +7586,7 @@ void AliFlowAnalysisWithQCumulants::StoreIntFlowFlags()
  fIntFlowFlags->Fill(10.5,(Int_t)fMinimumBiasReferenceFlow);
  fIntFlowFlags->Fill(11.5,(Int_t)fForgetAboutCovariances);
  fIntFlowFlags->Fill(12.5,(Int_t)fStorePhiDistributionForOneEvent); 
+ fIntFlowFlags->Fill(13.5,(Int_t)fFillMultipleControlHistograms);  
 } // end of void AliFlowAnalysisWithQCumulants::StoreIntFlowFlags()
 
 //================================================================================================================================
@@ -7591,10 +7608,8 @@ void AliFlowAnalysisWithQCumulants::StoreDiffFlowFlags()
     
 } // end of void AliFlowAnalysisWithQCumulants::StoreDiffFlowFlags()
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::GetPointersForCommonHistograms() 
 {
  // Access all pointers to common control and common result histograms and profiles.
@@ -7625,7 +7640,8 @@ void AliFlowAnalysisWithQCumulants::GetPointersForCommonHistograms()
  TString commonHists8thOrderName = "AliFlowCommonHist8thOrderQC";
  commonHists8thOrderName += fAnalysisLabel->Data();
  AliFlowCommonHist *commonHist8th = dynamic_cast<AliFlowCommonHist*>(fHistList->FindObject(commonHists8thOrderName.Data()));
- if(commonHist8th) this->SetCommonHists8th(commonHist8th);  
+ if(commonHist8th) this->SetCommonHists8th(commonHist8th); 
+  
  TString commonHistResults2ndOrderName = "AliFlowCommonHistResults2ndOrderQC"; 
  commonHistResults2ndOrderName += fAnalysisLabel->Data(); 
  AliFlowCommonHistResults *commonHistRes2nd = dynamic_cast<AliFlowCommonHistResults*>
@@ -9438,26 +9454,25 @@ void AliFlowAnalysisWithQCumulants::GetPointersForNestedLoopsHistograms()
 
 } // end of void AliFlowAnalysisWithQCumulants::GetPointersForNestedLoopsHistograms()
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::StoreHarmonic()
 {
  // Store flow harmonic in common control histograms.
 
  (fCommonHists->GetHarmonic())->Fill(0.5,fHarmonic);
- (fCommonHists2nd->GetHarmonic())->Fill(0.5,fHarmonic);
- (fCommonHists4th->GetHarmonic())->Fill(0.5,fHarmonic);
- (fCommonHists6th->GetHarmonic())->Fill(0.5,fHarmonic);
- (fCommonHists8th->GetHarmonic())->Fill(0.5,fHarmonic);
-
+ if(fFillMultipleControlHistograms)
+ {
+  (fCommonHists2nd->GetHarmonic())->Fill(0.5,fHarmonic);
+  (fCommonHists4th->GetHarmonic())->Fill(0.5,fHarmonic);
+  (fCommonHists6th->GetHarmonic())->Fill(0.5,fHarmonic);
+  (fCommonHists8th->GetHarmonic())->Fill(0.5,fHarmonic);
+ }
+ 
 } // end of void AliFlowAnalysisWithQCumulants::StoreHarmonic()
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCorrelationsUsingParticleWeights(TString type, TString ptOrEta) // type = RP or POI 
 {
  // Calculate all correlations needed for differential flow using particle weights.
@@ -9639,39 +9654,38 @@ void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCorrelationsUsingParticleWe
 
 } // end of void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCorrelationsUsingParticleWeights(TString type, TString ptOrEta); // type = RP or POI 
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::FillCommonControlHistograms(AliFlowEventSimple *anEvent)
 {
  // Fill common control histograms.
  
  Int_t nRP = anEvent->GetEventNSelTracksRP(); // number of RPs (i.e. number of particles used to determine the reaction plane)
  fCommonHists->FillControlHistograms(anEvent); 
- if(nRP>1)
+ if(fFillMultipleControlHistograms)
  {
-  fCommonHists2nd->FillControlHistograms(anEvent);                                        
-  if(nRP>3)
+  if(nRP>1)
   {
-   fCommonHists4th->FillControlHistograms(anEvent);                                        
-   if(nRP>5)
+   fCommonHists2nd->FillControlHistograms(anEvent);                                        
+   if(nRP>3)
    {
-    fCommonHists6th->FillControlHistograms(anEvent);                                        
-    if(nRP>7)
+    fCommonHists4th->FillControlHistograms(anEvent);                                        
+    if(nRP>5)
     {
-     fCommonHists8th->FillControlHistograms(anEvent);                                        
-    } // end of if(nRP>7)  
-   } // end of if(nRP>5) 
-  } // end of if(nRP>3)                                                                                                                      
- } // end of if(nRP>1) 
+     fCommonHists6th->FillControlHistograms(anEvent);                                        
+     if(nRP>7)
+     {
+      fCommonHists8th->FillControlHistograms(anEvent);                                        
+     } // end of if(nRP>7)  
+    } // end of if(nRP>5) 
+   } // end of if(nRP>3)                                                                                                                      
+  } // end of if(nRP>1) 
+ } // end of if(fFillMultipleControlHistograms)
  
 } // end of void AliFlowAnalysisWithQCumulants::FillCommonControlHistograms(AliFlowEventSimple *anEvent)
 
-
 //================================================================================================================================
 
-
 void AliFlowAnalysisWithQCumulants::ResetEventByEventQuantities()
 {
  // Reset all event by event quantities.

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
index c4be54d6694ea223667186002e822a9e83226935..4f9ebebbcc700728cfb9ea4ee5e3936470acc71d 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
@@ -181,12 +181,15 @@ class AliFlowAnalysisWithQCumulants{
   AliFlowCommonHistResults* GetCommonHistsResults6th() const {return this->fCommonHistsResults6th;};
   void SetCommonHistsResults8th(AliFlowCommonHistResults* const chr8th) {this->fCommonHistsResults8th = chr8th;};
   AliFlowCommonHistResults* GetCommonHistsResults8th() const {return this->fCommonHistsResults8th;};
+  void SetFillMultipleControlHistograms(Bool_t const fmch) {this->fFillMultipleControlHistograms = fmch;};
+  Bool_t GetFillMultipleControlHistograms() const {return this->fFillMultipleControlHistograms;};  
   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);}; // to be improved (Append(*aLabel) changed into Append(aLabel)) 
   TString *GetAnalysisLabel() const {return this->fAnalysisLabel;};
   void SetPrintFinalResults(Bool_t const printOrNot, Int_t const i) {this->fPrintFinalResults[i] = printOrNot;};
   Bool_t GetPrintFinalResults(Int_t i) const {return this->fPrintFinalResults[i];};
+  
    
   // 2a.) particle weights:
   void SetWeightsList(TList* const wlist) {this->fWeightsList = (TList*)wlist->Clone();}
@@ -419,6 +422,7 @@ class AliFlowAnalysisWithQCumulants{
   Double_t fEtaMin; // minimum eta   
   Double_t fEtaMax; // maximum eta
   Double_t fEtaBinWidth; // bin width for eta histograms  
+  Bool_t fFillMultipleControlHistograms; // fill separately control histos for events with >= 2, 4, 6 and 8 particles 
   Int_t fHarmonic; // harmonic 
   TString *fAnalysisLabel; // analysis label (all histograms and output file will have this label)
   Bool_t fPrintFinalResults[4]; // print on the screen the final results (0=RF, 1=RP, 2=POI, 3=RF rebinned in M)

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx
index a7b085b6cfcc720305b8343f01f838bcd2be36e4..57d9c931ffb669abf09af706bf793892ed38313e 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.cxx
@@ -42,13 +42,14 @@ AliAnalysisTaskQCumulants::AliAnalysisTaskQCumulants(const char *name, Bool_t us
  fEvent(NULL),
  fQC(NULL), 
  fListHistos(NULL),
+ fFillMultipleControlHistograms(kFALSE),
  fHarmonic(2),  
  fApplyCorrectionForNUA(kFALSE), 
  fApplyCorrectionForNUAVsM(kFALSE), 
  fPropagateErrorAlsoFromNIT(kFALSE),
  fCalculate2DFlow(kFALSE),
  fStoreDistributions(kFALSE),
- fCalculateCumulantsVsM(kTRUE), 
+ fCalculateCumulantsVsM(kFALSE), 
  fMinimumBiasReferenceFlow(kTRUE), 
  fForgetAboutCovariances(kFALSE),  
  fStorePhiDistributionForOneEvent(kFALSE),
@@ -93,6 +94,7 @@ AliAnalysisTaskQCumulants::AliAnalysisTaskQCumulants():
  fEvent(NULL),
  fQC(NULL),
  fListHistos(NULL),
+ fFillMultipleControlHistograms(kFALSE),
  fHarmonic(0),  
  fApplyCorrectionForNUA(kFALSE), 
  fApplyCorrectionForNUAVsM(kFALSE), 
@@ -135,6 +137,7 @@ void AliAnalysisTaskQCumulants::UserCreateOutputObjects()
  fQC = new AliFlowAnalysisWithQCumulants();
  
  // Common:
+ fQC->SetFillMultipleControlHistograms(fFillMultipleControlHistograms);
  fQC->SetHarmonic(fHarmonic);
  fQC->SetApplyCorrectionForNUA(fApplyCorrectionForNUA);
  fQC->SetApplyCorrectionForNUAVsM(fApplyCorrectionForNUAVsM);

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h
index 7733a18548a43c03b882804f00ad33de18053e8e..185c870e2756c97d28d2a58176bec41aa8265599 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQCumulants.h
@@ -38,6 +38,8 @@ class AliAnalysisTaskQCumulants : public AliAnalysisTaskSE{
   virtual void Terminate(Option_t *);
   
   // Common:
+  void SetFillMultipleControlHistograms(Bool_t const fmch) {this->fFillMultipleControlHistograms = fmch;};
+  Bool_t GetFillMultipleControlHistograms() const {return this->fFillMultipleControlHistograms;}; 
   void SetHarmonic(Int_t const harmonic) {this->fHarmonic = harmonic;};
   Int_t GetHarmonic() const {return this->fHarmonic;};
   void SetApplyCorrectionForNUA(Bool_t const applyCorrectionForNUA) {this->fApplyCorrectionForNUA = applyCorrectionForNUA;};
@@ -86,15 +88,16 @@ class AliAnalysisTaskQCumulants : public AliAnalysisTaskSE{
   AliFlowAnalysisWithQCumulants *fQC; // Q-cumulant object
   TList *fListHistos;                 // collection of output 
   // Common:
-  Int_t fHarmonic;                   // harmonic  
-  Bool_t fApplyCorrectionForNUA;     // apply correction for non-uniform acceptance 
-  Bool_t fApplyCorrectionForNUAVsM;  // apply correction for non-uniform acceptance versus M    
-  Bool_t fPropagateErrorAlsoFromNIT; // propagate error by taking into account also non-isotrpic terms  
-  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
-  Bool_t fCalculateCumulantsVsM;     // calculate cumulants versus multiplicity  
-  Bool_t fMinimumBiasReferenceFlow;  // store as reference flow in AliFlowCommonHistResults the minimum bias result (kFALSE by default)     
-  Bool_t fForgetAboutCovariances;    // when propagating error forget about the covariances  
+  Bool_t fFillMultipleControlHistograms; // fill separately control histos for events with >= 2, 4, 6 and 8 particles
+  Int_t fHarmonic;                       // harmonic  
+  Bool_t fApplyCorrectionForNUA;         // apply correction for non-uniform acceptance 
+  Bool_t fApplyCorrectionForNUAVsM;      // apply correction for non-uniform acceptance versus M    
+  Bool_t fPropagateErrorAlsoFromNIT;     // propagate error by taking into account also non-isotrpic terms  
+  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
+  Bool_t fCalculateCumulantsVsM;         // calculate cumulants versus multiplicity  
+  Bool_t fMinimumBiasReferenceFlow;      // store as reference flow in AliFlowCommonHistResults the minimum bias result (kFALSE by default)     
+  Bool_t fForgetAboutCovariances;        // when propagating error forget about the covariances  
   Bool_t fStorePhiDistributionForOneEvent; // store phi distribution for one event to illustrate flow
   Double_t fPhiDistributionForOneEventSettings[4]; // [v_min,v_max,refMult_min,refMult_max]        
   // Multiparticle correlations vs multiplicity:

diff --git a/PWG2/FLOW/macros/AddTaskFlowCentrality.C b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
index b7a0686a9d28c8a9669a6f18b95efa747de479d5..4918c380178213ff587030860841da210259ea07 100644 (file)
--- a/PWG2/FLOW/macros/AddTaskFlowCentrality.C
+++ b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
@@ -324,7 +324,8 @@ void AddTaskFlowCentrality( Float_t centrMin=0.,
   if (SP){
     AliAnalysisTaskScalarProduct *taskSP = new AliAnalysisTaskScalarProduct("TaskScalarProduct",WEIGHTS[0]);
     taskSP->SetRelDiffMsub(1.0);
-    taskSP->SetApplyCorrectionForNUA(kTRUE);
+    taskSP->SetApplyCorrectionForNUA(kFALSE);
+    //taskSP->SetHarmonic(2); // default is v2
     mgr->AddTask(taskSP);
   }
   if (LYZ1SUM){
@@ -367,10 +368,13 @@ void AddTaskFlowCentrality( Float_t centrMin=0.,
     taskQC->SetUsePhiWeights(WEIGHTS[0]); 
     taskQC->SetUsePtWeights(WEIGHTS[1]);
     taskQC->SetUseEtaWeights(WEIGHTS[2]); 
+    taskQC->SetCalculateCumulantsVsM(kFALSE);
     taskQC->SetnBinsMult(10000);
     taskQC->SetMinMult(0.);
     taskQC->SetMaxMult(10000.);
-    taskQC->SetApplyCorrectionForNUA(kTRUE);
+    //taskQC->SetHarmonic(2); // default is v2
+    taskQC->SetApplyCorrectionForNUA(kFALSE);
+    taskQC->SetFillMultipleControlHistograms(kFALSE);     
     mgr->AddTask(taskQC);
   }
   if (FQD){

diff --git a/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C b/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C
index 7c937b321ef5fee35b487940fda98cb68e861fee..afbf693e08bf705871db063f8f4ba1995737f7e4 100644 (file)
--- a/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C
+++ b/PWG2/FLOW/macros/runFlowAnalysisOnTheFly.C
@@ -302,11 +302,13 @@ int runFlowAnalysisOnTheFly(Int_t nEvts=1000, Int_t mode=mLocal)
    if(usePtWeights) qc->SetUsePtWeights(usePtWeights);
    if(useEtaWeights) qc->SetUseEtaWeights(useEtaWeights);
    // qc->SetHarmonic(2); // default is v2
-   // qc->SetApplyCorrectionForNUA(kTRUE); // default
+   qc->SetApplyCorrectionForNUA(kFALSE);
+   qc->SetFillMultipleControlHistograms(kFALSE);     
    // qc->SetCalculate2DFlow(kFALSE); // default
    // qc->SetMultiplicityWeight("combinations"); // default
    // qc->SetMultiplicityWeight("unit");
    // qc->SetMultiplicityWeight("multiplicity");  
+   qc->SetCalculateCumulantsVsM(kFALSE);
    qc->SetnBinsMult(10000);
    qc->SetMinMult(0);
    qc->SetMaxMult(10000);