weights correctly implemented for FQD
authorsnelling <snelling@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 19 Feb 2009 11:44:03 +0000 (11:44 +0000)
committersnelling <snelling@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 19 Feb 2009 11:44:03 +0000 (11:44 +0000)
PWG2/FLOW/AliFlowCommon/AliFittingQDistribution.cxx
PWG2/FLOW/AliFlowCommon/AliFittingQDistribution.h
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.cxx
PWG2/FLOW/AliFlowTasks/AliAnalysisTaskFittingQDistribution.h
PWG2/FLOW/macros/makeWeights.C
PWG2/FLOW/macros/runAliAnalysisTaskFlow.C
PWG2/FLOW/macros/runFlowAnalysis.C

index becab15..a7105c6 100644 (file)
@@ -64,9 +64,7 @@ AliFittingQDistribution::AliFittingQDistribution():
  fCommonHists(NULL),
  fCommonHistsResults(NULL),
  fQDistributionFQD(NULL),
- fUsePhiWeights(kFALSE),
- fUsePtWeights(kFALSE),
- fUseEtaWeights(kFALSE)
+ fUsePhiWeights(kFALSE)
 {
  //constructor 
  fHistList = new TList();
@@ -148,7 +146,7 @@ void AliFittingQDistribution::Make(AliFlowEventSimple* anEvent)
  AliFlowVector fQVector;
  fQVector.Set(0.,0.);
  fQVector.SetMult(0);
- fQVector=anEvent->GetQ(n,fWeightsList,fUsePhiWeights,fUsePtWeights,fUseEtaWeights);                                                                                  
+ fQVector=anEvent->GetQ(n,fWeightsList,fUsePhiWeights);                                                                                  
                                                                                                                                                                       
  //multiplicity
  fAvMultIntFlowFQD->Fill(0.,fQVector.GetMult(),1.);
index 61f5a2b..0afb8b3 100644 (file)
@@ -69,11 +69,6 @@ class AliFittingQDistribution{
   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;};
 //----------------------------------------------------------------------------------------------------------------
  
  private:
@@ -81,7 +76,7 @@ class AliFittingQDistribution{
   AliFittingQDistribution& operator=(const AliFittingQDistribution& afqd);
   
   AliFlowTrackSimple*        fTrack;                   //track
-   
+           
   TList*                     fHistList;                //list to hold all output histograms
   TList*                     fWeightsList;             //list to hold all histograms with weights
   
@@ -93,8 +88,6 @@ class AliFittingQDistribution{
   TH1D*                      fQDistributionFQD;        //q-distribution 
   
   Bool_t                     fUsePhiWeights;           //phi weights
-  Bool_t                     fUsePtWeights;            //v_2(pt) weights
-  Bool_t                     fUseEtaWeights;           //v_2(eta) weights
          
   ClassDef(AliFittingQDistribution, 0);
 };
index 8d3586c..c4325d9 100644 (file)
@@ -1404,6 +1404,11 @@ void AliFlowAnalysisWithQCumulants::Make(AliFlowEventSimple* anEvent)
 //---------------------------------------------------------------------------------------------------------
 
 
+ delete mPerBinPtRP; 
+ delete mPerBinEtaRP; 
+ delete mPrimePrimePerBinPtPOI; 
+ delete mPrimePrimePerBinEtaPOI; 
+
 
 
 
index 7a26593..7eb0cde 100644 (file)
@@ -75,8 +75,6 @@ AliAnalysisTaskFittingQDistribution::AliAnalysisTaskFittingQDistribution(const c
  fQA(on),
  fUseWeights(useWeights),
  fUsePhiWeights(kFALSE),
- fUsePtWeights(kFALSE),
- fUseEtaWeights(kFALSE),
  fListWeights(NULL)
 {
  //constructor
@@ -115,8 +113,6 @@ AliAnalysisTaskFittingQDistribution::AliAnalysisTaskFittingQDistribution():
  fQA(kFALSE),
  fUseWeights(kFALSE),
  fUsePhiWeights(kFALSE),
- fUsePtWeights(kFALSE),
- fUseEtaWeights(kFALSE),
  fListWeights(NULL)
 {
  //dummy constructor
@@ -207,8 +203,6 @@ void AliAnalysisTaskFittingQDistribution::CreateOutputObjects()
  {
   //pass the flags to class:
   if(fUsePhiWeights) fFQDA->SetUsePhiWeights(fUsePhiWeights);
-  if(fUsePtWeights) fFQDA->SetUsePtWeights(fUsePtWeights);
-  if(fUseEtaWeights) fFQDA->SetUseEtaWeights(fUseEtaWeights);
   //get data from input slot #1 which is used for weights:
   if(GetNinputs()==2) 
   {                   
index 6e5b117..7c0fece 100644 (file)
@@ -16,8 +16,8 @@
  *           (anteb@nikhef.nl)        * 
  * ***********************************/
 
-#ifndef AliAnalysisTaskFittingQDistribution_H
-#define AliAnalysisTaskFittingQDistribution_H
+#ifndef ALIANALYSISTASKFITTINGQDISTRIBUTION_H
+#define ALIANALYSISTASKFITTINGQDISTRIBUTION_H
 
 #include "TString.h"
 #include "AliAnalysisTask.h"
@@ -58,10 +58,6 @@ class AliAnalysisTaskFittingQDistribution : public AliAnalysisTask{
   
   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;};
  
  private:
   AliAnalysisTaskFittingQDistribution(const AliAnalysisTaskFittingQDistribution& aatfqd);
@@ -83,8 +79,6 @@ class AliAnalysisTaskFittingQDistribution : public AliAnalysisTask{
   
   Bool_t       fUseWeights;               // use any weights
   Bool_t       fUsePhiWeights;            // phi weights
-  Bool_t       fUsePtWeights;             // v_2(pt) weights
-  Bool_t       fUseEtaWeights;            // v_2(eta) weights  
   TList*       fListWeights;              // list with weights                                               
                                                            
   ClassDef(AliAnalysisTaskFittingQDistribution, 1); 
index 4e8eff3..708b1af 100755 (executable)
@@ -21,8 +21,8 @@ void makeWeights(TString type="ESD", TString method="GFC", TString cumulantOrder
  //for AliRoot
  gSystem->AddIncludePath("-I$ALICE_ROOT/include");
  gSystem->Load("libANALYSIS.so");
- gSystem->Load("libPWG2flow.so");
- cerr<<"libPWG2flow.so loaded ..."<<endl;
+ gSystem->Load("libPWG2flowCommon.so");
+ cerr<<"libPWG2flowCommon.so loaded ..."<<endl;
 
  //open the output file from the first run of the specified method:
  TString inputFileName = "output";
index 28961d8..d40eb6f 100644 (file)
@@ -572,8 +572,6 @@ void runAliAnalysisTaskFlow(Int_t mode=mPROOF, const Char_t* data="/PWG2/akisiel
     else { AliAnalysisTaskFittingQDistribution *taskFQD = new AliAnalysisTaskFittingQDistribution("TaskFittingQDistribution",kFALSE,useWeights);}
     taskFQD->SetAnalysisType(type);
     taskFQD->SetUsePhiWeights(usePhiWeights); 
-    taskFQD->SetUsePtWeights(usePtWeights);
-    taskFQD->SetUseEtaWeights(useEtaWeights);
     taskFQD->SetCFManager1(cfmgr1);
     taskFQD->SetCFManager2(cfmgr2);
     if (QA) { 
index 0463ae2..5716a2b 100644 (file)
@@ -231,8 +231,6 @@ int runFlowAnalysis(Int_t aRuns = 100, const char*
     fqd->Init();
     if(listWithWeights) fqd->SetWeightsList(listWithWeights);
     if(usePhiWeights) fqd->SetUsePhiWeights(usePhiWeights);
-    if(usePtWeights) fqd->SetUsePtWeights(usePtWeights);
-    if(useEtaWeights) fqd->SetUseEtaWeights(useEtaWeights);
   }
 
   //SP = Scalar Product