QA updates and mods for pass2

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.cxx
index b44e5d19bf3934487894238c0d634b233f5e25e8..139089968df87169e9d9836658cccfe97bc3fcc3 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.cxx
@@ -103,6 +103,10 @@ AliAnalysisTaskPIDflowQA:: AliAnalysisTaskPIDflowQA():
   fCutsTOFbetaSimplePions(NULL),
   fCutsTOFbetaSimpleKaons(NULL),
   fCutsTOFbetaSimpleProtons(NULL),
+  fCutsTOFbayesianElectrons(NULL),
+  fCutsTOFbayesianPions(NULL),
+  fCutsTOFbayesianKaons(NULL),
+  fCutsTOFbayesianProtons(NULL),
   fCutsTPCdedxElectrons(NULL),
   fCutsTPCdedxPions(NULL),
   fCutsTPCdedxKaons(NULL),
@@ -111,6 +115,18 @@ AliAnalysisTaskPIDflowQA:: AliAnalysisTaskPIDflowQA():
   fCutsTPCpidPions(NULL),
   fCutsTPCpidKaons(NULL),
   fCutsTPCpidProtons(NULL),
+  fCutsTPCbayesianElectrons(NULL),
+  fCutsTPCbayesianPions(NULL),
+  fCutsTPCbayesianKaons(NULL),
+  fCutsTPCbayesianProtons(NULL),
+  fCutsMCelectrons(NULL),
+  fCutsMCpions(NULL),
+  fCutsMCkaons(NULL),
+  fCutsMCprotons(NULL),
+  fCutsMCprimaryelectrons(NULL),
+  fCutsMCprimarypions(NULL),
+  fCutsMCprimarykaons(NULL),
+  fCutsMCprimaryprotons(NULL),
   fOutputList(NULL)
 {
   //def ctor
@@ -175,6 +191,10 @@ AliAnalysisTaskPIDflowQA:: AliAnalysisTaskPIDflowQA(const char *name):
   fCutsTOFbetaSimplePions(NULL),
   fCutsTOFbetaSimpleKaons(NULL),
   fCutsTOFbetaSimpleProtons(NULL),
+  fCutsTOFbayesianElectrons(NULL),
+  fCutsTOFbayesianPions(NULL),
+  fCutsTOFbayesianKaons(NULL),
+  fCutsTOFbayesianProtons(NULL),
   fCutsTPCdedxElectrons(NULL),
   fCutsTPCdedxPions(NULL),
   fCutsTPCdedxKaons(NULL),
@@ -183,6 +203,18 @@ AliAnalysisTaskPIDflowQA:: AliAnalysisTaskPIDflowQA(const char *name):
   fCutsTPCpidPions(NULL),
   fCutsTPCpidKaons(NULL),
   fCutsTPCpidProtons(NULL),
+  fCutsTPCbayesianElectrons(NULL),
+  fCutsTPCbayesianPions(NULL),
+  fCutsTPCbayesianKaons(NULL),
+  fCutsTPCbayesianProtons(NULL),
+  fCutsMCelectrons(NULL),
+  fCutsMCpions(NULL),
+  fCutsMCkaons(NULL),
+  fCutsMCprotons(NULL),
+  fCutsMCprimaryelectrons(NULL),
+  fCutsMCprimarypions(NULL),
+  fCutsMCprimarykaons(NULL),
+  fCutsMCprimaryprotons(NULL),
   fOutputList(NULL)
 {
   //Constructor
@@ -342,7 +374,6 @@ void  AliAnalysisTaskPIDflowQA::UserCreateOutputObjects()
   fCutsTOFbetaPions = new AliFlowTrackCuts("TOFbeta pi");
   fCutsTOFbetaPions->SetPID(AliPID::kPion, AliFlowTrackCuts::kTOFbeta);
   fCutsTOFbetaPions->SetRequireStrictTOFTPCagreement();
-  fCutsTOFbetaPions->SetRejectElectronsWithTPCpid();
   fCutsTOFbetaPions->SetQA();
   fCutsTOFbetaKaons = new AliFlowTrackCuts("TOFbeta K");
   fCutsTOFbetaKaons->SetPID(AliPID::kKaon, AliFlowTrackCuts::kTOFbeta);
@@ -359,7 +390,6 @@ void  AliAnalysisTaskPIDflowQA::UserCreateOutputObjects()
   fCutsTOFbetaSimpleElectrons->SetQA();
   fCutsTOFbetaSimplePions = new AliFlowTrackCuts("TOFbetaSimple pi");
   fCutsTOFbetaSimplePions->SetPID(AliPID::kPion, AliFlowTrackCuts::kTOFbetaSimple);
-  fCutsTOFbetaSimplePions->SetRejectElectronsWithTPCpid();
   fCutsTOFbetaSimplePions->SetRequireStrictTOFTPCagreement();
   fCutsTOFbetaSimplePions->SetQA();
   fCutsTOFbetaSimpleKaons = new AliFlowTrackCuts("TOFbetaSimple K");
@@ -371,10 +401,27 @@ void  AliAnalysisTaskPIDflowQA::UserCreateOutputObjects()
   fCutsTOFbetaSimpleProtons->SetRequireStrictTOFTPCagreement();
   fCutsTOFbetaSimpleProtons->SetQA();
 
+  fCutsTOFbayesianElectrons = new AliFlowTrackCuts("TOFbayesian e");
+  fCutsTOFbayesianElectrons->SetPID(AliPID::kElectron, AliFlowTrackCuts::kTOFbayesian);
+  fCutsTOFbayesianElectrons->SetRequireStrictTOFTPCagreement();
+  fCutsTOFbayesianElectrons->SetQA();
+  fCutsTOFbayesianPions = new AliFlowTrackCuts("TOFbayesian pi");
+  fCutsTOFbayesianPions->SetPID(AliPID::kPion, AliFlowTrackCuts::kTOFbayesian);
+  fCutsTOFbayesianPions->SetRequireStrictTOFTPCagreement();
+  fCutsTOFbayesianPions->SetQA();
+  fCutsTOFbayesianKaons = new AliFlowTrackCuts("TOFbayesian K");
+  fCutsTOFbayesianKaons->SetPID(AliPID::kKaon, AliFlowTrackCuts::kTOFbayesian);
+  fCutsTOFbayesianKaons->SetRequireStrictTOFTPCagreement();
+  fCutsTOFbayesianKaons->SetQA();
+  fCutsTOFbayesianProtons = new AliFlowTrackCuts("TOFbayesian p");
+  fCutsTOFbayesianProtons->SetPID(AliPID::kProton, AliFlowTrackCuts::kTOFbayesian);
+  fCutsTOFbayesianProtons->SetRequireStrictTOFTPCagreement();
+  fCutsTOFbayesianProtons->SetQA();
+
   fCutsTPCdedxElectrons = new AliFlowTrackCuts("TPCdedx e");
   fCutsTPCdedxElectrons->SetPID(AliPID::kElectron, AliFlowTrackCuts::kTPCdedx);
   fCutsTPCdedxElectrons->SetQA();
-  fCutsTPCdedxPions = new AliFlowTrackCuts("TPCdedx Pi");
+  fCutsTPCdedxPions = new AliFlowTrackCuts("TPCdedx pi");
   fCutsTPCdedxPions->SetPID(AliPID::kPion, AliFlowTrackCuts::kTPCdedx);
   fCutsTPCdedxPions->SetQA();
   fCutsTPCdedxKaons = new AliFlowTrackCuts("TPCdedx K");
@@ -387,7 +434,7 @@ void  AliAnalysisTaskPIDflowQA::UserCreateOutputObjects()
   fCutsTPCpidElectrons = new AliFlowTrackCuts("TPCpid e");
   fCutsTPCpidElectrons->SetPID(AliPID::kElectron, AliFlowTrackCuts::kTPCpid);
   fCutsTPCpidElectrons->SetQA();
-  fCutsTPCpidPions = new AliFlowTrackCuts("TPCpid Pi");
+  fCutsTPCpidPions = new AliFlowTrackCuts("TPCpid pi");
   fCutsTPCpidPions->SetPID(AliPID::kPion, AliFlowTrackCuts::kTPCpid);
   fCutsTPCpidPions->SetQA();
   fCutsTPCpidKaons = new AliFlowTrackCuts("TPCpid K");
@@ -397,6 +444,57 @@ void  AliAnalysisTaskPIDflowQA::UserCreateOutputObjects()
   fCutsTPCpidProtons->SetPID(AliPID::kProton, AliFlowTrackCuts::kTPCpid);
   fCutsTPCpidProtons->SetQA();
 
+  fCutsTPCbayesianElectrons = new AliFlowTrackCuts("TPCbayesian e");
+  fCutsTPCbayesianElectrons->SetPID(AliPID::kElectron, AliFlowTrackCuts::kTPCbayesian);
+  fCutsTPCbayesianElectrons->SetQA();
+  fCutsTPCbayesianPions = new AliFlowTrackCuts("TPCbayesian pi");
+  fCutsTPCbayesianPions->SetPID(AliPID::kPion, AliFlowTrackCuts::kTPCbayesian);
+  fCutsTPCbayesianPions->SetQA();
+  fCutsTPCbayesianKaons = new AliFlowTrackCuts("TPCbayesian K");
+  fCutsTPCbayesianKaons->SetPID(AliPID::kKaon, AliFlowTrackCuts::kTPCbayesian);
+  fCutsTPCbayesianKaons->SetQA();
+  fCutsTPCbayesianProtons = new AliFlowTrackCuts("TPCbayesian p");
+  fCutsTPCbayesianProtons->SetPID(AliPID::kProton, AliFlowTrackCuts::kTPCbayesian);
+  fCutsTPCbayesianProtons->SetQA();
+
+  fCutsMCelectrons=new AliFlowTrackCuts("MC e");
+  fCutsMCelectrons->SetMCPID(11);
+  fCutsMCelectrons->SetIgnoreSignInMCPID();
+  fCutsMCelectrons->SetQA();
+  fCutsMCpions=new AliFlowTrackCuts("MC pi");
+  fCutsMCpions->SetMCPID(211);
+  fCutsMCpions->SetIgnoreSignInMCPID();
+  fCutsMCpions->SetQA();
+  fCutsMCkaons=new AliFlowTrackCuts("MC K");
+  fCutsMCpions->SetMCPID(321);
+  fCutsMCpions->SetIgnoreSignInMCPID();
+  fCutsMCpions->SetQA();
+  fCutsMCprotons=new AliFlowTrackCuts("MC p");
+  fCutsMCpions->SetMCPID(2212);
+  fCutsMCpions->SetIgnoreSignInMCPID();
+  fCutsMCpions->SetQA();
+
+  fCutsMCprimaryelectrons=new AliFlowTrackCuts("MCprimary e");
+  fCutsMCprimaryelectrons->SetMCPID(11);
+  fCutsMCprimaryelectrons->SetIgnoreSignInMCPID();
+  fCutsMCprimaryelectrons->SetMCisPrimary();
+  fCutsMCprimaryelectrons->SetQA();
+  fCutsMCprimarypions=new AliFlowTrackCuts("MCprimary pi");
+  fCutsMCprimarypions->SetMCPID(211);
+  fCutsMCprimarypions->SetIgnoreSignInMCPID();
+  fCutsMCprimarypions->SetMCisPrimary();
+  fCutsMCprimarypions->SetQA();
+  fCutsMCprimarykaons=new AliFlowTrackCuts("MCprimary K");
+  fCutsMCprimarypions->SetMCPID(321);
+  fCutsMCprimarypions->SetIgnoreSignInMCPID();
+  fCutsMCprimarypions->SetMCisPrimary();
+  fCutsMCprimarypions->SetQA();
+  fCutsMCprimaryprotons=new AliFlowTrackCuts("MCprimary p");
+  fCutsMCprimarypions->SetMCPID(2212);
+  fCutsMCprimarypions->SetIgnoreSignInMCPID();
+  fCutsMCprimarypions->SetMCisPrimary();
+  fCutsMCprimarypions->SetQA();
+
   //fOutputList->Add(fESDpid);
 
   fOutputList->Add(fCutsTPCdedxElectrons->GetQA());
@@ -407,6 +505,10 @@ void  AliAnalysisTaskPIDflowQA::UserCreateOutputObjects()
   fOutputList->Add(fCutsTPCpidPions->GetQA());
   fOutputList->Add(fCutsTPCpidKaons->GetQA());
   fOutputList->Add(fCutsTPCpidProtons->GetQA());
+  fOutputList->Add(fCutsTPCbayesianElectrons->GetQA());
+  fOutputList->Add(fCutsTPCbayesianPions->GetQA());
+  fOutputList->Add(fCutsTPCbayesianKaons->GetQA());
+  fOutputList->Add(fCutsTPCbayesianProtons->GetQA());
   fOutputList->Add(fCutsTOFbetaElectrons->GetQA());
   fOutputList->Add(fCutsTOFbetaPions->GetQA());
   fOutputList->Add(fCutsTOFbetaKaons->GetQA());
@@ -415,6 +517,18 @@ void  AliAnalysisTaskPIDflowQA::UserCreateOutputObjects()
   fOutputList->Add(fCutsTOFbetaSimplePions->GetQA());
   fOutputList->Add(fCutsTOFbetaSimpleKaons->GetQA());
   fOutputList->Add(fCutsTOFbetaSimpleProtons->GetQA());
+  fOutputList->Add(fCutsTOFbayesianElectrons->GetQA());
+  fOutputList->Add(fCutsTOFbayesianPions->GetQA());
+  fOutputList->Add(fCutsTOFbayesianKaons->GetQA());
+  fOutputList->Add(fCutsTOFbayesianProtons->GetQA());
+  fOutputList->Add(fCutsMCelectrons->GetQA());
+  fOutputList->Add(fCutsMCpions->GetQA());
+  fOutputList->Add(fCutsMCkaons->GetQA());
+  fOutputList->Add(fCutsMCprotons->GetQA());
+  fOutputList->Add(fCutsMCprimaryelectrons->GetQA());
+  fOutputList->Add(fCutsMCprimarypions->GetQA());
+  fOutputList->Add(fCutsMCprimarykaons->GetQA());
+  fOutputList->Add(fCutsMCprimaryprotons->GetQA());
 
   if (fUseDebugFile) fFile = fopen("debug.txt","w");
 
@@ -462,6 +576,10 @@ void  AliAnalysisTaskPIDflowQA::UserExec(Option_t *)
   fCutsTPCpidPions->SetEvent(fESD,mcEvent);
   fCutsTPCpidKaons->SetEvent(fESD,mcEvent);
   fCutsTPCpidProtons->SetEvent(fESD,mcEvent);
+  fCutsTPCbayesianElectrons->SetEvent(fESD,mcEvent);
+  fCutsTPCbayesianPions->SetEvent(fESD,mcEvent);
+  fCutsTPCbayesianKaons->SetEvent(fESD,mcEvent);
+  fCutsTPCbayesianProtons->SetEvent(fESD,mcEvent);
   fCutsTOFbetaElectrons->SetEvent(fESD,mcEvent);
   fCutsTOFbetaPions->SetEvent(fESD,mcEvent);
   fCutsTOFbetaKaons->SetEvent(fESD,mcEvent);
@@ -470,6 +588,18 @@ void  AliAnalysisTaskPIDflowQA::UserExec(Option_t *)
   fCutsTOFbetaSimplePions->SetEvent(fESD,mcEvent);
   fCutsTOFbetaSimpleKaons->SetEvent(fESD,mcEvent);
   fCutsTOFbetaSimpleProtons->SetEvent(fESD,mcEvent);
+  fCutsTOFbayesianElectrons->SetEvent(fESD,mcEvent);
+  fCutsTOFbayesianPions->SetEvent(fESD,mcEvent);
+  fCutsTOFbayesianKaons->SetEvent(fESD,mcEvent);
+  fCutsTOFbayesianProtons->SetEvent(fESD,mcEvent);
+  fCutsMCelectrons->SetEvent(fESD,mcEvent);
+  fCutsMCpions->SetEvent(fESD,mcEvent);
+  fCutsMCkaons->SetEvent(fESD,mcEvent);
+  fCutsMCprotons->SetEvent(fESD,mcEvent);
+  fCutsMCprimaryelectrons->SetEvent(fESD,mcEvent);
+  fCutsMCprimarypions->SetEvent(fESD,mcEvent);
+  fCutsMCprimarykaons->SetEvent(fESD,mcEvent);
+  fCutsMCprimaryprotons->SetEvent(fESD,mcEvent);
 
   for(int tr1=0; tr1<nTracks; tr1++)
   {
@@ -498,6 +628,18 @@ void  AliAnalysisTaskPIDflowQA::UserExec(Option_t *)
     pidTOF(trackESD,pdgcode);
   }
 
+  for (Int_t imc=0; imc<(mcEvent!=NULL)?mcEvent->GetNumberOfTracks():0;imc++)
+  {
+    fCutsMCelectrons->IsSelected(mcEvent->GetTrack(imc));
+    fCutsMCpions->IsSelected(mcEvent->GetTrack(imc));
+    fCutsMCkaons->IsSelected(mcEvent->GetTrack(imc));
+    fCutsMCprotons->IsSelected(mcEvent->GetTrack(imc));
+    fCutsMCprimaryelectrons->IsSelected(mcEvent->GetTrack(imc));
+    fCutsMCprimarypions->IsSelected(mcEvent->GetTrack(imc));
+    fCutsMCprimarykaons->IsSelected(mcEvent->GetTrack(imc));
+    fCutsMCprimaryprotons->IsSelected(mcEvent->GetTrack(imc));
+  }
+
   //check the correlation between the global and TPConly number of tracks
   fStandardGlobalCuts->SetEvent(fESD);
   fStandardTPCCuts->SetEvent(fESD);
@@ -564,6 +706,10 @@ void AliAnalysisTaskPIDflowQA::pidTPC(AliESDtrack* t, Int_t)
   fCutsTPCpidPions->IsSelected(t);
   fCutsTPCpidKaons->IsSelected(t);
   fCutsTPCpidProtons->IsSelected(t);
+  fCutsTPCbayesianElectrons->IsSelected(t);
+  fCutsTPCbayesianPions->IsSelected(t);
+  fCutsTPCbayesianKaons->IsSelected(t);
+  fCutsTPCbayesianProtons->IsSelected(t);
 }
 
 //______________________________________________________________________________
@@ -658,6 +804,10 @@ void AliAnalysisTaskPIDflowQA::pidTOF(AliESDtrack* track, Int_t)
   fCutsTOFbetaSimplePions->IsSelected(track);
   fCutsTOFbetaSimpleKaons->IsSelected(track);
   fCutsTOFbetaSimpleProtons->IsSelected(track);
+  fCutsTOFbayesianElectrons->IsSelected(track);
+  fCutsTOFbayesianPions->IsSelected(track);
+  fCutsTOFbayesianKaons->IsSelected(track);
+  fCutsTOFbayesianProtons->IsSelected(track);
 }
 
 //______________________________________________________________________________

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.h b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.h
index 153eb652c7df7d81a3c69ce29e71c30e713afdec..7d5bd374c25ddb79e01941fa5142fa7f0f319f19 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.h
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskPIDflowQA.h
@@ -103,6 +103,11 @@ private:
   AliFlowTrackCuts* fCutsTOFbetaSimpleKaons; //!
   AliFlowTrackCuts* fCutsTOFbetaSimpleProtons; //!
 
+  AliFlowTrackCuts* fCutsTOFbayesianElectrons; //!
+  AliFlowTrackCuts* fCutsTOFbayesianPions; //!
+  AliFlowTrackCuts* fCutsTOFbayesianKaons; //!
+  AliFlowTrackCuts* fCutsTOFbayesianProtons; //!
+
   AliFlowTrackCuts* fCutsTPCdedxElectrons; //!
   AliFlowTrackCuts* fCutsTPCdedxPions; //!
   AliFlowTrackCuts* fCutsTPCdedxKaons; //!
@@ -113,6 +118,20 @@ private:
   AliFlowTrackCuts* fCutsTPCpidKaons; //!
   AliFlowTrackCuts* fCutsTPCpidProtons; //!
 
+  AliFlowTrackCuts* fCutsTPCbayesianElectrons; //!
+  AliFlowTrackCuts* fCutsTPCbayesianPions; //!
+  AliFlowTrackCuts* fCutsTPCbayesianKaons; //!
+  AliFlowTrackCuts* fCutsTPCbayesianProtons; //!
+
+  AliFlowTrackCuts* fCutsMCelectrons;
+  AliFlowTrackCuts* fCutsMCpions;
+  AliFlowTrackCuts* fCutsMCkaons;
+  AliFlowTrackCuts* fCutsMCprotons;
+  AliFlowTrackCuts* fCutsMCprimaryelectrons;
+  AliFlowTrackCuts* fCutsMCprimarypions;
+  AliFlowTrackCuts* fCutsMCprimarykaons;
+  AliFlowTrackCuts* fCutsMCprimaryprotons;
+
   TList* fOutputList;//!output list
        
   AliAnalysisTaskPIDflowQA(const  AliAnalysisTaskPIDflowQA&); // not implemented

diff --git a/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.cxx b/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.cxx
index 7b5dfd1dd1c1d77ba7d4d43008c81abe36021e2a..692d8bfff71eaa48272238e8af2c46c5be2abf0d 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.cxx
@@ -1359,7 +1359,7 @@ void AliFlowTrackCuts::DefineHistograms()
 
   const Int_t nBinsDCA=1000;
   Double_t binsDCA[nBinsDCA+1];
-  for(int i=0; i<=nBinsDCA; i++) {binsDCA[i]=0.05*i;}
+  for(int i=0; i<nBinsDCA+1; i++) {binsDCA[i]=0.01*i-5.;}
   //for(int i=1; i<41; i++) {binsDCA[i+100]=0.1*i+1.0;}
 
   Bool_t adddirstatus = TH1::AddDirectoryStatus();
@@ -3350,6 +3350,8 @@ const char* AliFlowTrackCuts::PIDsourceName(PIDsource s)
   {
     case kTPCdedx:
       return "TPCdedx";
+    case kTPCbayesian:
+      return "TPCbayesian";
     case kTOFbeta:
       return "TOFbeta";
     case kTPCpid:

diff --git a/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.h b/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.h
index 4c249066dfb9c5c4b7380b484b213ca210ab437f..e8c457e737eb4027fa60af16f89392e2b0220abe 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.h
+++ b/PWG2/FLOW/AliFlowTasks/AliFlowTrackCuts.h
@@ -143,11 +143,11 @@ class AliFlowTrackCuts : public AliFlowTrackSimpleCuts {
   TH1* QAafter(Int_t i) {return static_cast<TH1*>(static_cast<TList*>(fQA->At(1))->At(i));}  
 
   //MC stuff
-  void SetIgnoreSignInMCPID( Bool_t b ) {fIgnoreSignInMCPID=b;}
+  void SetIgnoreSignInMCPID( Bool_t b=kTRUE ) {fIgnoreSignInMCPID=b;}
   void SetCutMC( Bool_t b=kTRUE );
   void SetCutMChasTrackReferences(Bool_t b=kTRUE) {fCutMChasTrackReferences=b;}
   void SetMCprocessType( TMCProcess t ) { fMCprocessType = t; fCutMCprocessType=kTRUE; SetCutMC();}
-  void SetMCisPrimary( Bool_t b ) { fMCisPrimary=b; fCutMCisPrimary=kTRUE; SetCutMC();}
+  void SetMCisPrimary( Bool_t b=kTRUE ) { fMCisPrimary=b; fCutMCisPrimary=kTRUE; SetCutMC();}
   void SetMCPID( Int_t pid ) { fMCPID=pid; fCutMCPID=kTRUE; SetCutMC(); }
   TMCProcess GetMCprocessType() const { return fMCprocessType; }
   Bool_t GetMCisPrimary() const {return fMCisPrimary;}

diff --git a/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx b/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx
index c763d247c0efab1cbe1bf315affd4b3861f484f5..5de4fa2ed53b5d89325acbf7680706011917078e 100644 (file)
--- a/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx
+++ b/PWG2/FLOW/AliFlowTools/glauberMC/AliGlauberMC.cxx
@@ -1523,7 +1523,11 @@ void AliGlauberMC::Run(Int_t nevents)
   if (fnt == 0)
   {
     fnt = new TNtuple(name,title,
-                      "Npart:Ncoll:B:MeanX:MeanY:MeanX2:MeanY2:MeanXY:VarX:VarY:VarXY:MeanXSystem:MeanYSystem:MeanXA:MeanYA:MeanXB:MeanYB:VarE:Stoa:VarEColl:VarECom:VarEPart:VarEPartColl:VarEPartCom:dNdEta:dNdEtaGBW:dNdEtaTwoNBD:xsect:tAA:Epsl2:Epsl3:Epsl4:Epsl5:E2Coll:E3Coll:E4Coll:E5Coll:E2Com:E3Com:E4Com:E5Com:Psi2:Psi3:Psi4:Psi5");
+                      "Npart:Ncoll:B:MeanX:MeanY:MeanX2:MeanY2:MeanXY:VarX:VarY:"
+                      "VarXY:MeanXSystem:MeanYSystem:MeanXA:MeanYA:MeanXB:MeanYB:VarE:Stoa:VarEColl:"
+                      "VarECom:VarEPart:VarEPartColl:VarEPartCom:dNdEta1:dNdEta2:dNdEtaSum:xsect:tAA:Epsl2:"
+                      "Epsl3:Epsl4:Epsl5:E2Coll:E3Coll:E4Coll:E5Coll:E2Com:E3Com:E4Com:"
+                      "E5Com:Psi2:Psi3:Psi4:Psi5");
     fnt->SetDirectory(0);
   }
   Int_t q = 0;

diff --git a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
index fd4c7e92c6ab6f6666534364ea61aa0bf9574e47..0e73b86afebc83b81c41789ffcde8565731a1691 100644 (file)
--- a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
+++ b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
@@ -71,6 +71,7 @@ void runFlowTaskCentralityTrain( Int_t mode = mPROOF,
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask* centSelTask = AddTaskCentrality();
   if (!DATA) centSelTask->SetMCInput();
+  if (DATA) centSelTask->SetPass(1);
 
 
   if (useTender)