fix macro control plots npart eccentricity

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAflow.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAflow.cxx
index c6bf6c309685bda8d9b69511dbcec6cfc342ef66..153b3226f540d7596de2b426d856616ed2951f33 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAflow.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskQAflow.cxx
@@ -106,6 +106,8 @@ void AliAnalysisTaskQAflow::UserCreateOutputObjects()
   before->Add(hist); after->Add(hist->Clone()); //13
   hist = new TH1D("TPC_vertex_z", "TPC vertex z", 100,-20.0,20.0);
   before->Add(hist); after->Add(hist->Clone()); //14
+  hist = new TH1D("ptyield", "p_{t} spectrum", 10000,0.0,10.0);
+  before->Add(hist); after->Add(hist->Clone()); //15
   
   //post data here as it doesn't change anyway (the pointer to list anyway)
 
@@ -160,6 +162,8 @@ void AliAnalysisTaskQAflow::UserExec(Option_t *)
   TH1* hetatracksA = dynamic_cast<TH1*>(after->At(13));
   TH1* hprimvtxzTPCB = dynamic_cast<TH1*>(before->At(14));
   TH1* hprimvtxzTPCA = dynamic_cast<TH1*>(after->At(14));
+  TH1* hptyieldB = dynamic_cast<TH1*>(before->At(15));
+  TH1* hptyieldA = dynamic_cast<TH1*>(after->At(15));
 
   AliMultiplicity* tracklets = const_cast<AliMultiplicity*>(event->GetMultiplicity());
   Int_t ntracklets=0;
@@ -231,6 +235,7 @@ void AliAnalysisTaskQAflow::UserExec(Option_t *)
     Int_t nitscls=0;
     Float_t eta=0.0;
     Float_t phi=0.0;
+    Float_t pt=0.0;
     AliESDtrack* track = dynamic_cast<AliESDtrack*>(fTrackCuts->GetTrack());
     if (track)
     {
@@ -239,7 +244,8 @@ void AliAnalysisTaskQAflow::UserExec(Option_t *)
       ntpccls=track->GetTPCNcls();
       eta=track->Eta();
       phi=track->Phi();
-      meanpt+=track->Pt();
+      pt=track->Pt();
+      meanpt+=pt;
       tpcchi2percls= (ntpccls==0)?0.0:tpcchi2/ntpccls;
       nitscls = track->GetNcls(0);
       hITSclsB->Fill(nitscls); if (pass) hITSclsA->Fill( nitscls);
@@ -249,6 +255,7 @@ void AliAnalysisTaskQAflow::UserExec(Option_t *)
       hdcazB->Fill(dcaz); if (pass) hdcazA->Fill(dcaz);
       hetatracksB->Fill(eta); if (pass) hetatracksA->Fill(eta);
       hphitracksB->Fill(phi); if (pass) hphitracksA->Fill(phi);
+      hptyieldB->Fill(pt); if (pass) hptyieldA->Fill(pt);
     }
   }
   meanpt = meanpt/ntracks;

diff --git a/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx b/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx
index b198892a52590985899c0d988b30a91e18269bf8..0616a3176b953e9007ce362c170fdc96aed32ad7 100644 (file)
--- a/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx
+++ b/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx
@@ -645,7 +645,7 @@ Double_t AliGlauberMC::GetEccentricityPartColl() const
 Double_t AliGlauberMC::GetEccentricity() const
 {
   //get standard eccentricity of participants
-  if (fNcoll<2) return 0.0;
+  if (fNpart<2) return 0.0;
   return ((fSy2-fSx2)/(fSy2+fSx2));
 }
 

diff --git a/PWG2/FLOW/Documentation/examples/runGlauberMCexample.C b/PWG2/FLOW/Documentation/examples/runGlauberMCexample.C
index d131c3a9c803e9cfb1abf5aec6a4a62d8cbabeb6..3c825daa91bcbd4006954478c43bc9e7b43f4b1a 100644 (file)
--- a/PWG2/FLOW/Documentation/examples/runGlauberMCexample.C
+++ b/PWG2/FLOW/Documentation/examples/runGlauberMCexample.C
@@ -16,11 +16,11 @@
   Option_t *sysA="Pb"; 
   Option_t *sysB="Pb";
   Double_t signn=72; // inelastic nucleon nucleon cross section
-  const char *fname="GlauberMC_PbPb_ntuple.root"; // name output file
+  //const char *fname="GlauberMC_PbPb_ntuple.root"; // name output file
 
   // run the code to produce an ntuple:
   //  AliGlauberMC::runAndSaveNucleons(10000,"Pb","Pb",72);
   Double_t mind=0.4;
-  AliGlauberMC::runAndSaveNtuple(nevents,sysA,sysB,signn,mind,fname);
+  AliGlauberMC::runAndSaveNtuple(nevents,sysA,sysB,signn,mind);
 
 }