working cumulant task

diff --git a/PWG2/FLOW/AliAnalysisTaskCumulants.cxx b/PWG2/FLOW/AliAnalysisTaskCumulants.cxx
index 75778e0693b71dcde147a16e309c7b3dd747fd17..bfbf8765e4d625442b77850ac4de57029eb16d07 100644 (file)
--- a/PWG2/FLOW/AliAnalysisTaskCumulants.cxx
+++ b/PWG2/FLOW/AliAnalysisTaskCumulants.cxx
@@ -167,7 +167,7 @@ void AliAnalysisTaskCumulants::Exec(Option_t *)
 
     //Cumulants analysis 
     AliFlowEventSimple* fEvent = fEventMaker->FillTracks(mcEvent);
-    fMyCumuAnalysis->Exec(fEvent);
+    fMyCumuAnalysis->Make(fEvent);
     delete fEvent;
   }
   else if (fAnalysisType == "ESD") {
@@ -179,7 +179,7 @@ void AliAnalysisTaskCumulants::Exec(Option_t *)
     
     //Cumulant analysis 
     AliFlowEventSimple* fEvent = fEventMaker->FillTracks(fESD);
-    fMyCumuAnalysis->Exec(fEvent);
+    fMyCumuAnalysis->Make(fEvent);
     delete fEvent;
   }
   else if (fAnalysisType == "ESDMC0") {
@@ -203,7 +203,7 @@ void AliAnalysisTaskCumulants::Exec(Option_t *)
 
     //Cumulant analysis 
     AliFlowEventSimple* fEvent = fEventMaker->FillTracks(fESD,mcEvent,0); //0 = kine from ESD, 1 = kine from MC
-    fMyCumuAnalysis->Exec(fEvent);
+    fMyCumuAnalysis->Make(fEvent);
     delete fEvent;
     //delete mcEvent;
   }
@@ -228,7 +228,7 @@ void AliAnalysisTaskCumulants::Exec(Option_t *)
 
     //Cumulant analysis 
     AliFlowEventSimple* fEvent = fEventMaker->FillTracks(fESD,mcEvent,1); //0 = kine from ESD, 1 = kine from MC
-    fMyCumuAnalysis->Exec(fEvent);
+    fMyCumuAnalysis->Make(fEvent);
     delete fEvent;
     //delete mcEvent;
   }
@@ -241,7 +241,7 @@ void AliAnalysisTaskCumulants::Exec(Option_t *)
 
     //Cumulant analysis 
     AliFlowEventSimple* fEvent = fEventMaker->FillTracks(fAOD);
-    fMyCumuAnalysis->Exec(fEvent);
+    fMyCumuAnalysis->Make(fEvent);
     delete fEvent;
   }
   
@@ -253,8 +253,7 @@ void AliAnalysisTaskCumulants::Terminate(Option_t *)
   // Called once at the end of the query
   cerr<<"fMyCumuAnalysis->GetHistFile() -> IsOpen() = "<<fMyCumuAnalysis->GetHistFile() -> IsOpen()<<endl;
 
-  //  fMyCumuAnalysis->Terminate(); // how it should be Ante please fix
-  fMyCumuAnalysis->Terminate(100);
+  fMyCumuAnalysis->Finish(); 
 
   PostData(0,fMyCumuAnalysis->GetHistFile());
 
@@ -262,4 +261,4 @@ void AliAnalysisTaskCumulants::Terminate(Option_t *)
   delete fEventMaker;
 
   cout<<".....finished"<<endl;
-}
+}
\ No newline at end of file

diff --git a/PWG2/FLOW/AliAnalysisTaskCumulants.h b/PWG2/FLOW/AliAnalysisTaskCumulants.h
index 750c99af564effb26c482d5710e781fafea79454..0cf598ed7da4636d7637b34653a072ec315a9096 100644 (file)
--- a/PWG2/FLOW/AliAnalysisTaskCumulants.h
+++ b/PWG2/FLOW/AliAnalysisTaskCumulants.h
@@ -48,4 +48,3 @@ class AliAnalysisTaskCumulants : public AliAnalysisTask {
 };
 
 #endif
-

diff --git a/PWG2/FLOW/AliFlowAnalysisWithCumulants.cxx b/PWG2/FLOW/AliFlowAnalysisWithCumulants.cxx
index 36b5e52ff48c8326b7ac4e5ed2dde3d73d56786c..dd4ecc795a987b74b9cfc47dda767e8dc9f45374 100644 (file)
--- a/PWG2/FLOW/AliFlowAnalysisWithCumulants.cxx
+++ b/PWG2/FLOW/AliFlowAnalysisWithCumulants.cxx
@@ -40,7 +40,7 @@ ClassImp(AliFlowAnalysisWithCumulants)
 
 AliFlowAnalysisWithCumulants::AliFlowAnalysisWithCumulants():  
   fTrack(NULL),
-  fHistFileName("cummulants.root"),
+  fHistFileName("cumulants.root"),
   fHistFile(NULL),
   fAvM(0),
   fR0(0),
@@ -51,6 +51,7 @@ AliFlowAnalysisWithCumulants::AliFlowAnalysisWithCumulants():
   fAvQy(0),
   fAvQ2x(0),
   fAvQ2y(0),
+  fNumberOfEvents(0),
   fCommonHists(NULL),
   fCommonHistsRes2(NULL),
   fCommonHistsRes4(NULL),
@@ -95,9 +96,9 @@ void AliFlowAnalysisWithCumulants::CreateOutputObjects(){
 }
 
 //________________________________________________________________________
-void AliFlowAnalysisWithCumulants::Exec(AliFlowEventSimple* anEvent) {
+void AliFlowAnalysisWithCumulants::Make(AliFlowEventSimple* anEvent) {
   //running over data
- 
+   
   fCommonHists->FillControlHistograms(anEvent);   
   
   Double_t fG[fgkPmax][fgkQmax];//generating function for integrated flow
@@ -202,11 +203,17 @@ void AliFlowAnalysisWithCumulants::Exec(AliFlowEventSimple* anEvent) {
     }
   }
   //----------------------------------------------------------
+
+fNumberOfEvents++;
+
 }
 
 //________________________________________________________________________
-void AliFlowAnalysisWithCumulants::Terminate(Int_t nEvents){
+void AliFlowAnalysisWithCumulants::Finish(){
   //final results
+    
+  Int_t nEvents=fNumberOfEvents;
+  
   cout<<""<<endl;
   cout<<"***************************************"<<endl;
   cout<<"**** results of cumulant analysis: ****"<<endl;
@@ -307,44 +314,57 @@ void AliFlowAnalysisWithCumulants::Terminate(Int_t nEvents){
   Double_t fChiQ[4]={0.};
    if (fCumulant[0]>=0.){ 
     fV2=sqrt(fCumulant[0]);    
-    fChiQ[0]=fAvM*fV2/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV2*fAvM,2.),0.5);
-    fSdQ[0]=pow(((1./(2.*fAvM*nEvents))*((1.+1.*pow(fChiQ[0],2))/(1.*pow(fChiQ[0],2)))),0.5);
-    cout<<" v_"<<fgkFlow<<"{2} = "<<100.*fV2<<"%, chi{2} = "<<fChiQ[0]<<", sd{2} = "<<100.*fSdQ[0]<<"%"<<endl;
-    fCommonHistsRes2->FillIntegratedFlow(100.*fV2,100.*fSdQ[0]);
-    fCommonHistsRes2->FillChi(fChiQ[0]);
+    if (fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV2*fAvM,2.)>0.){
+     fChiQ[0]=fAvM*fV2/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV2*fAvM,2.),0.5);
+     fSdQ[0]=pow(((1./(2.*fAvM*nEvents))*((1.+1.*pow(fChiQ[0],2))/(1.*pow(fChiQ[0],2)))),0.5);
+     cout<<" v_"<<fgkFlow<<"{2} = "<<100.*fV2<<"%, chi{2} = "<<fChiQ[0]<<", sd{2} = "<<100.*fSdQ[0]<<"%"<<endl;
+     fCommonHistsRes2->FillIntegratedFlow(100.*fV2,100.*fSdQ[0]);
+     fCommonHistsRes2->FillChi(fChiQ[0]);
+    }
    } else {
     cout<<" v_"<<fgkFlow<<"{2} = Im"<<endl;  
   }
   if (fCumulant[1]<=0.){
     fV4=pow(-fCumulant[1],(1./4.));
-    fChiQ[1]=fAvM*fV4/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV4*fAvM,2.),0.5);
-    fSdQ[1]=(1./(pow(2.*fAvM*nEvents,.5)))*pow((1.+2.*pow(fChiQ[1],2)+(1./4.)*pow(fChiQ[1],4.)+(1./4.)*pow(fChiQ[1],6.))/((1./4.)*pow(fChiQ[1],6.)),.5);
-    cout<<" v_"<<fgkFlow<<"{4} = "<<100.*fV4<<"%, chi{4} = "<<fChiQ[1]<<", sd{4} = "<<100.*fSdQ[1]<<"%"<<endl;
-    fCommonHistsRes4->FillIntegratedFlow(100.*fV4,100.*fSdQ[1]);
-    fCommonHistsRes4->FillChi(fChiQ[1]);
+    if (fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV4*fAvM,2.)>0.){
+     fChiQ[1]=fAvM*fV4/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV4*fAvM,2.),0.5);
+     fSdQ[1]=(1./(pow(2.*fAvM*nEvents,.5)))*pow((1.+2.*pow(fChiQ[1],2)+(1./4.)*pow(fChiQ[1],4.)+(1./4.)*pow(fChiQ[1],6.))/((1./4.)*pow(fChiQ[1],6.)),.5);
+     cout<<" v_"<<fgkFlow<<"{4} = "<<100.*fV4<<"%, chi{4} = "<<fChiQ[1]<<", sd{4} = "<<100.*fSdQ[1]<<"%"<<endl;
+     fCommonHistsRes4->FillIntegratedFlow(100.*fV4,100.*fSdQ[1]);
+     fCommonHistsRes4->FillChi(fChiQ[1]);
+    } else {
+      cout<<" v_"<<fgkFlow<<"{4} = Im"<<endl;
+    }
   } else {
     cout<<" v_"<<fgkFlow<<"{4} = Im"<<endl;  
   } 
   if (fCumulant[2]>=0.){
     fV6=pow((1./4.)*fCumulant[2],(1./6.));
-    fChiQ[2]=fAvM*fV6/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV6*fAvM,2.),0.5);
-    fSdQ[2]=(1./(pow(2.*fAvM*nEvents,.5)))*pow((3.+18.*pow(fChiQ[2],2)+9.*pow(fChiQ[2],4.)+28.*pow(fChiQ[2],6.)+12.*pow(fChiQ[2],8.)+24.*pow(fChiQ[2],10.))/(24.*pow(fChiQ[2],10.)),.5);
-    cout<<" v_"<<fgkFlow<<"{6} = "<<100.*fV6<<"%, chi{6} = "<<fChiQ[2]<<", sd{6} = "<<100.*fSdQ[2]<<"%"<<endl;
-    fCommonHistsRes6->FillIntegratedFlow(100.*fV6,100.*fSdQ[2]);
-    fCommonHistsRes6->FillChi(fChiQ[2]);
+    if (fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV6*fAvM,2.)>0.){
+     fChiQ[2]=fAvM*fV6/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV6*fAvM,2.),0.5);
+     fSdQ[2]=(1./(pow(2.*fAvM*nEvents,.5)))*pow((3.+18.*pow(fChiQ[2],2)+9.*pow(fChiQ[2],4.)+28.*pow(fChiQ[2],6.)+12.*pow(fChiQ[2],8.)+24.*pow(fChiQ[2],10.))/(24.*pow(fChiQ[2],10.)),.5);
+     cout<<" v_"<<fgkFlow<<"{6} = "<<100.*fV6<<"%, chi{6} = "<<fChiQ[2]<<", sd{6} = "<<100.*fSdQ[2]<<"%"<<endl;
+     fCommonHistsRes6->FillIntegratedFlow(100.*fV6,100.*fSdQ[2]);
+     fCommonHistsRes6->FillChi(fChiQ[2]);
+    } else {
+      cout<<" v_"<<fgkFlow<<"{6} = Im"<<endl; 
+    }
   } else {
     cout<<" v_"<<fgkFlow<<"{6} = Im"<<endl;  
   }
   if (fCumulant[3]<=0.){
     fV8=pow(-(1./33.)*fCumulant[3],(1./8.));
-    fChiQ[3]=fAvM*fV8/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV8*fAvM,2.),0.5);
-    fSdQ[3]=(1./(pow(2.*fAvM*nEvents,.5)))*pow((12.+96.*pow(fChiQ[3],2)+72.*pow(fChiQ[3],4.)+304.*pow(fChiQ[3],6.)+257.*pow(fChiQ[3],8.)+804.*pow(fChiQ[3],10.)+363.*pow(fChiQ[3],12.)+726.*pow(fChiQ[3],14.))/(726.*pow(fChiQ[3],14.)),.5);
-    cout<<" v_"<<fgkFlow<<"{8} = "<<100.*fV8<<"%, chi{8} = "<<fChiQ[3]<<", sd{8} = "<<100.*fSdQ[3]<<"%"<<endl;
-     fCommonHistsRes8->FillIntegratedFlow(100.*fV8,100.*fSdQ[3]);
-     fCommonHistsRes8->FillChi(fChiQ[3]);
+    if (fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV8*fAvM,2.)>0.){
+     fChiQ[3]=fAvM*fV8/pow(fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV8*fAvM,2.),0.5);
+     fSdQ[3]=(1./(pow(2.*fAvM*nEvents,.5)))*pow((12.+96.*pow(fChiQ[3],2)+72.*pow(fChiQ[3],4.)+304.*pow(fChiQ[3],6.)+257.*pow(fChiQ[3],8.)+804.*pow(fChiQ[3],10.)+363.*pow(fChiQ[3],12.)+726.*pow(fChiQ[3],14.))/(726.*pow(fChiQ[3],14.)),.5);
+     cout<<" v_"<<fgkFlow<<"{8} = "<<100.*fV8<<"%, chi{8} = "<<fChiQ[3]<<", sd{8} = "<<100.*fSdQ[3]<<"%"<<endl;
+      fCommonHistsRes8->FillIntegratedFlow(100.*fV8,100.*fSdQ[3]);
+      fCommonHistsRes8->FillChi(fChiQ[3]);
+     } else {
+       cout<<" v_"<<fgkFlow<<"{8} = Im"<<endl;
+     }
   } else {
-    cout<<" v_"<<fgkFlow<<"{8} = Im"<<endl;
-     
+    cout<<" v_"<<fgkFlow<<"{8} = Im"<<endl;     
   }
   if (fCumulant[4]>=0.){
     cout<<"v_"<<fgkFlow<<"{10} = "<<100.*pow((1./456.)*fCumulant[4],(1./10.))<<"%"<<endl;
@@ -368,9 +388,9 @@ void AliFlowAnalysisWithCumulants::Terminate(Int_t nEvents){
   }
   cout<<"***************************"<<endl;
   
-  cout<<""<<endl;
-  cout<<"continuing with calculations for differential flow..."<<endl;
-  cout<<""<<endl;
+  //cout<<""<<endl;
+  //cout<<"continuing with calculations for differential flow..."<<endl;
+  //cout<<""<<endl;
  
   Double_t fBinEventDReAv[fgknBins][fgkPmax][fgkQmax]={0.};
   Double_t fBinEventDImAv[fgknBins][fgkPmax][fgkQmax]={0.};
@@ -396,9 +416,10 @@ void AliFlowAnalysisWithCumulants::Terminate(Int_t nEvents){
       }
     }   
   } 
-  cout<<""<<endl;
-  cout<<"I have calculated X and Y."<<endl;
-  cout<<""<<endl;
+  
+  //cout<<""<<endl;
+  //cout<<"I have calculated X and Y."<<endl;
+  //cout<<""<<endl;
   
   Double_t fD[fgknBins][fgkPmax]={0.};//implementing relation (11) from PG
   
@@ -412,9 +433,9 @@ void AliFlowAnalysisWithCumulants::Terminate(Int_t nEvents){
     }
   } 
   
-  cout<<""<<endl;
-  cout<<"calculating differential cumulants now..."<<endl;
-  cout<<""<<endl;
+  //cout<<""<<endl;
+  //cout<<"calculating differential cumulants now..."<<endl;
+  //cout<<""<<endl;
   
   Double_t fDiffCumulant2[fgknBins]={0.};//implementing relation (12) from PG
   Double_t fDiffCumulant4[fgknBins]={0.};
@@ -432,47 +453,54 @@ void AliFlowAnalysisWithCumulants::Terminate(Int_t nEvents){
   Double_t fAvPt[fgknBins];
   Double_t fSddiff2[fgknBins],fSddiff4[fgknBins];
 
-  cout<<"number of pt bins: "<<fgknBins<<endl;
-  cout<<"****************************************"<<endl;
+  //cout<<"number of pt bins: "<<fgknBins<<endl;
+  //cout<<"****************************************"<<endl;
   for (Int_t b=0;b<fgknBins;b++){ 
     if(fBinNoOfParticles[b]==0)continue;
     fAvPt[b]=fBinMeanPt[b]/fBinNoOfParticles[b];
-    cout<<"pt bin: "<<b*fBinWidth<<"-"<<(b+1)*fBinWidth<<" GeV"<<endl;
-    cout<<"number of particles in this pt bin: "<<fBinNoOfParticles[b]<<endl;
-    cout<<"mean pt in this bin: "<<fAvPt[b]<<" GeV"<<endl;
+    //cout<<"pt bin: "<<b*fBinWidth<<"-"<<(b+1)*fBinWidth<<" GeV"<<endl;
+    //cout<<"number of particles in this pt bin: "<<fBinNoOfParticles[b]<<endl;
+    //cout<<"mean pt in this bin: "<<fAvPt[b]<<" GeV"<<endl;
     if(fCumulant[0]>=0){
       fv2[b]=100.*fDiffCumulant2[b]/pow(fCumulant[0],.5);
-      fSddiff2[b]=pow((1./(2.*fBinNoOfParticles[b]))*((1.+pow(fChiQ[0],2.))/pow(fChiQ[0],2.)),0.5);
-      cout<<"v'_2/2{2} = "<<fv2[b]<<"%, "<<" "<<"sd{2} = "<<100.*fSddiff2[b]<<"%"<<endl;
-      fCommonHistsRes2->FillDifferentialFlow(b+1,fv2[b],100.*fSddiff2[b]);
+      if (fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV2*fAvM,2.)>0.){
+       fSddiff2[b]=pow((1./(2.*fBinNoOfParticles[b]))*((1.+pow(fChiQ[0],2.))/pow(fChiQ[0],2.)),0.5);
+       //cout<<"v'_2/2{2} = "<<fv2[b]<<"%, "<<" "<<"sd{2} = "<<100.*fSddiff2[b]<<"%"<<endl;
+       fCommonHistsRes2->FillDifferentialFlow(b+1,fv2[b],100.*fSddiff2[b]);
+      } else {
+        //cout<<"v'_2/2{2} = Im"<<endl;
+      }
     }else{
-      cout<<"v'_2/2{2} = Im"<<endl;
+      //cout<<"v'_2/2{2} = Im"<<endl;
     } 
     if(fCumulant[1]<=0){
       fv4[b]=-100.*fDiffCumulant4[b]/pow(-fCumulant[1],.75);
-      fSddiff4[b]=pow((1./(2.*fBinNoOfParticles[b]))*((2.+6.*pow(fChiQ[1],2.)+pow(fChiQ[1],4.)+pow(fChiQ[1],6.))/pow(fChiQ[1],6.)),0.5);
-      cout<<"v'_2/2{4} = "<<fv4[b]<<"%, "<<" "<<"sd{4} = "<<100.*fSddiff4[b]<<"%"<<endl;
-      fCommonHistsRes4->FillDifferentialFlow(b+1,fv4[b],100.*fSddiff4[b]);
+      if (fAvQ2x+fAvQ2y-pow(fAvQx,2.)-pow(fAvQy,2.)-pow(fV4*fAvM,2.)>0.){
+       fSddiff4[b]=pow((1./(2.*fBinNoOfParticles[b]))*((2.+6.*pow(fChiQ[1],2.)+pow(fChiQ[1],4.)+pow(fChiQ[1],6.))/pow(fChiQ[1],6.)),0.5);
+       //cout<<"v'_2/2{4} = "<<fv4[b]<<"%, "<<" "<<"sd{4} = "<<100.*fSddiff4[b]<<"%"<<endl;
+       fCommonHistsRes4->FillDifferentialFlow(b+1,fv4[b],100.*fSddiff4[b]);
+      } else {
+        //cout<<"v'_2/2{4} = Im"<<endl;
+      } 
     }else{
-      cout<<"v'_2/2{4} = Im"<<endl;
+      //cout<<"v'_2/2{4} = Im"<<endl;
     }  
     if(fCumulant[2]>=0){
-      cout<<"v'_2/2{6} = "<<100.*fDiffCumulant6[b]/(4.*pow((1./4.)*fCumulant[2],(5./6.)))<<"%"<<endl;
+      //cout<<"v'_2/2{6} = "<<100.*fDiffCumulant6[b]/(4.*pow((1./4.)*fCumulant[2],(5./6.)))<<"%"<<endl;
       fv6[b]=100.*fDiffCumulant6[b]/(4.*pow((1./4.)*fCumulant[2],(5./6.)));
       fCommonHistsRes6->FillDifferentialFlow(b+1,fv6[b],0.);
     }else{
-      cout<<"v'_2/2{6} = Im"<<endl;
+      //cout<<"v'_2/2{6} = Im"<<endl;
     }     
     if(fCumulant[3]<=0){
-      cout<<"v'_2/2{8} = "<<-100.*fDiffCumulant8[b]/(33.*pow(-(1./33.)*fCumulant[3],(7./8.)))<<"%"<<endl;
+      //cout<<"v'_2/2{8} = "<<-100.*fDiffCumulant8[b]/(33.*pow(-(1./33.)*fCumulant[3],(7./8.)))<<"%"<<endl;
       fv8[b]=-100.*fDiffCumulant8[b]/(33.*pow(-(1./33.)*fCumulant[3],(7./8.))); 
       fCommonHistsRes8->FillDifferentialFlow(b+1,fv8[b],0.);
     }else{
-      cout<<"v'_2/2{8} = Im"<<endl;
+      //cout<<"v'_2/2{8} = Im"<<endl;
     }       
-    cout<<"****************************************"<<endl;
+    //cout<<"****************************************"<<endl;
   }  
 }
 
 
-

diff --git a/PWG2/FLOW/AliFlowAnalysisWithCumulants.h b/PWG2/FLOW/AliFlowAnalysisWithCumulants.h
index 0d97ef3a726a6a24407dbb7161bc25049e212912..219b52f9c95ccd79959f1a3bbe689c3a1959eded 100644 (file)
--- a/PWG2/FLOW/AliFlowAnalysisWithCumulants.h
+++ b/PWG2/FLOW/AliFlowAnalysisWithCumulants.h
@@ -27,8 +27,8 @@ class AliFlowAnalysisWithCumulants {
   virtual ~AliFlowAnalysisWithCumulants();
   
   virtual void CreateOutputObjects();
-  virtual void Exec(AliFlowEventSimple* anEvent);
-  virtual void Terminate(Int_t nEvents);
+  virtual void Make(AliFlowEventSimple* anEvent);
+  virtual void Finish();
 
   // Output 
   void SetHistFileName(TString name)  {this->fHistFileName = name ;} // Sets output file name
@@ -60,7 +60,9 @@ class AliFlowAnalysisWithCumulants {
   Double_t fAvQy;//<Q_y>
   Double_t fAvQ2x;//<(Q_x)^2>
   Double_t fAvQ2y;//<(Q_y)^2>
- 
+   
+  Int_t fNumberOfEvents;//number of events 
+   
   AliFlowCommonHist* fCommonHists;//control histograms
   AliFlowCommonHistResults *fCommonHistsRes2, *fCommonHistsRes4, *fCommonHistsRes6, *fCommonHistsRes8;//histograms with various order final results 
   
@@ -70,10 +72,9 @@ class AliFlowAnalysisWithCumulants {
   Double_t fBinMeanPt[fgknBins];//mean pt per bin
   Double_t fBinEventDRe[fgknBins][fgkPmax][fgkQmax];//real part of the generating function used for differential flow
   Double_t fBinEventDIm[fgknBins][fgkPmax][fgkQmax];//imaginary part of the generating function used for differential flow
-  
+    
   ClassDef(AliFlowAnalysisWithCumulants, 0);
 };
 #endif
 
 
-

diff --git a/PWG2/FLOW/macros/runAliAnalysisTaskCumulants.C b/PWG2/FLOW/macros/runAliAnalysisTaskCumulants.C
index de29c5f27049b8b4c680637e6de93a10810e4c22..8721bf831f4fe339978e361701deed26e6f870d6 100644 (file)
--- a/PWG2/FLOW/macros/runAliAnalysisTaskCumulants.C
+++ b/PWG2/FLOW/macros/runAliAnalysisTaskCumulants.C
@@ -2,8 +2,8 @@
 TChain* CreateESDChain(const char* aDataDir = "ESDfiles.txt", Int_t aRuns = 20, Int_t offset = 0) ;
 void LookupWrite(TChain* chain, const char* target) ;
 
-//void runAliAnalysisTaskCumulants(Int_t nRuns = 2, TString type = "ESD", const Char_t* dataDir="/Users/snelling/alice_data/TherminatorFIX", Int_t offset = 0) 
-void runAliAnalysisTaskCumulants(Int_t nRuns = 2, TString type = "MC", const Char_t* dataDir="/Users/snelling/alice_data/TherminatorFix", Int_t offset = 0) 
+void runAliAnalysisTaskCumulants(Int_t nRuns = 100, TString type = "ESD", const Char_t* dataDir="/data/alice2/ab2/", Int_t offset = 0) 
+//void runAliAnalysisTaskCumulants(Int_t nRuns = 2, TString type = "MC", const Char_t* dataDir="/Users/snelling/alice_data/TherminatorFix", Int_t offset = 0) 
 {
   TStopwatch timer;
   timer.Start();
@@ -179,4 +179,3 @@ void LookupWrite(TChain* chain, const char* target)
   
   delete iter;
 }
-

diff --git a/PWG2/FLOW/macros/runCumulantsOnKine.C b/PWG2/FLOW/macros/runCumulantsOnKine.C
index 514bd874e46598be4be51186631ce9bc9286a113..ab301bc7ca79bc3f26ab15610de3524de7b499ef 100644 (file)
--- a/PWG2/FLOW/macros/runCumulantsOnKine.C
+++ b/PWG2/FLOW/macros/runCumulantsOnKine.C
@@ -7,7 +7,7 @@ Int_t offset = 0 ;
 //int runCumulantsOnKine(Int_t aRuns = 144, Bool_t fFirstRunLYZ = kTRUE, Bool_t fDouble = kFALSE, const char * dir = "/users/alice/KineOnly3/")
 //int runCumulantsOnKine(Int_t aRuns = 10, Bool_t fFirstRunLYZ = kTRUE, Bool_t fDouble = kFALSE, const char * dir = "/data/alice2/LHyquid3_rot/")
 //int runCumulantsOnKine(Int_t aRuns = 144, const char * dir = "/Users/snelling/alice_data/KineOnly3/")
-int runCumulantsOnKine(Int_t aRuns = 144, const char * dir = "/Users/snelling/alice_data/TherminatorFIX/")
+int runCumulantsOnKine(Int_t aRuns = 100, const char * dir = "/Users/snelling/alice_data/TherminatorFIX/")
 //int runCumulantsOnKine(Int_t aRuns = 200, Bool_t fFirstRunLYZ = kTRUE, Bool_t fDouble = kFALSE, const char * dir = "/data/alice2/abDeleteMeASAP/")
 {
   TStopwatch timer;
@@ -18,12 +18,12 @@ int runCumulantsOnKine(Int_t aRuns = 144, const char * dir = "/Users/snelling/al
   gSystem->AddIncludePath("-I$ROOTSYS/include") ;
   gROOT->LoadMacro("AliFlowVector.cxx+");
   gROOT->LoadMacro("AliFlowCommonConstants.cxx+");
-  gROOT->LoadMacro("AliFlowCommonHist.cxx+");
-  gROOT->LoadMacro("AliFlowCommonHistResults.cxx+");
   gROOT->LoadMacro("AliFlowCumuConstants.cxx+");
   gROOT->LoadMacro("AliFlowTrackSimple.cxx+");
   gROOT->LoadMacro("AliFlowEventSimple.cxx+");
   gROOT->LoadMacro("AliFlowEventSimpleMaker.cxx+");
+  gROOT->LoadMacro("AliFlowCommonHist.cxx+");
+  gROOT->LoadMacro("AliFlowCommonHistResults.cxx+");
   gROOT->LoadMacro("AliFlowAnalysisWithCumulants.cxx+");
 
   cout<<" loaded macros "<<endl;