moving esd selector to aliselector (not RL)

[u/mrichter/AliRoot.git] / PWG0 / dNdEta / AlidNdEtaAnalysisESDSelector.cxx

diff --git a/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx b/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx
index b2bc268df2b826e71a4c06aa45f58af1f2729e39..852f581f7f0fcdf7918e808a4f158d56e7902fd7 100644 (file)
--- a/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx
+++ b/PWG0/dNdEta/AlidNdEtaAnalysisESDSelector.cxx
@@ -26,7 +26,7 @@
 ClassImp(AlidNdEtaAnalysisESDSelector)
 
 AlidNdEtaAnalysisESDSelector::AlidNdEtaAnalysisESDSelector() :
-  AliSelectorRL(),
+  AliSelector(),
   fdNdEtaAnalysis(0),
   fMult(0),
   fEsdTrackCuts(0)
@@ -75,7 +75,7 @@ void AlidNdEtaAnalysisESDSelector::SlaveBegin(TTree* tree)
   // When running with PROOF SlaveBegin() is called on each slave server.
   // The tree argument is deprecated (on PROOF 0 is passed).
 
-  AliSelectorRL::SlaveBegin(tree);
+  AliSelector::SlaveBegin(tree);
 
   ReadUserObjects(tree);
 
@@ -87,7 +87,7 @@ void AlidNdEtaAnalysisESDSelector::Init(TTree* tree)
 {
   // read the user objects
 
-  AliSelectorRL::Init(tree);
+  AliSelector::Init(tree);
 
   // Enable only the needed branches
   if (tree)
@@ -105,7 +105,7 @@ Bool_t AlidNdEtaAnalysisESDSelector::Process(Long64_t entry)
 {
   // loop over all events
 
-  if (AliSelectorRL::Process(entry) == kFALSE)
+  if (AliSelector::Process(entry) == kFALSE)
     return kFALSE;
 
   // Check prerequisites
@@ -133,42 +133,15 @@ Bool_t AlidNdEtaAnalysisESDSelector::Process(Long64_t entry)
     return kTRUE;
   }
 
-  AliHeader* header = GetHeader();
-  if (!header)
-  {
-    AliDebug(AliLog::kError, "Header not available");
-    return kFALSE;
-  }
-
-  AliStack* stack = GetStack();
-  if (!stack)
-  {
-    AliDebug(AliLog::kError, "Stack not available");
-    return kFALSE;
-  }
-
-  // get the MC vertex
-  AliGenEventHeader* genHeader = header->GenEventHeader();
-
-  TArrayF vtxMC(3);
-  genHeader->PrimaryVertex(vtxMC);
-
-  // ########################################################
   // get the ESD vertex
   const AliESDVertex* vtxESD = fESD->GetVertex();
   Double_t vtx[3];
   vtxESD->GetXYZ(vtx);
 
-  //vtx[2] = vtxMC[2];
-  //vtx[2] -= 2.951034e-03 + 6.859620e-04 * vtxMC[2];
-
   // get number of "good" tracks
   TObjArray* list = fEsdTrackCuts->GetAcceptedTracks(fESD);
   Int_t nGoodTracks = list->GetEntries();
 
-  // FAKE test!
-  //Int_t nContributors = vtxESD->GetNContributors();
-
   // loop over esd tracks
   for (Int_t t=0; t<nGoodTracks; t++)
   {
@@ -179,15 +152,6 @@ Bool_t AlidNdEtaAnalysisESDSelector::Process(Long64_t entry)
       continue;
     }
 
-    Int_t label = TMath::Abs(esdTrack->GetLabel());
-
-    TParticle* particle = stack->Particle(label);
-    if (!particle)
-    {
-      AliDebug(AliLog::kError, Form("ERROR: Could not retrieve particle %d.", esdTrack->GetLabel()));
-      continue;
-    }
-
     Double_t p[3];
     esdTrack->GetConstrainedPxPyPz(p); // ### TODO should be okay because we have a vertex, however GetInnerPxPyPy / GetOuterPxPyPy also exist
     TVector3 vector(p);
@@ -196,9 +160,6 @@ Bool_t AlidNdEtaAnalysisESDSelector::Process(Long64_t entry)
     Float_t eta   = -TMath::Log(TMath::Tan(theta/2.));
     Float_t pt = vector.Pt();
 
-    //eta = particle->Eta();
-    //pt = particle->Pt();
-
     fdNdEtaAnalysis->FillTrack(vtx[2], eta, pt);
   } // end of track loop
 
@@ -218,7 +179,7 @@ void AlidNdEtaAnalysisESDSelector::SlaveTerminate()
   // have been processed. When running with PROOF SlaveTerminate() is called
   // on each slave server.
 
-  AliSelectorRL::SlaveTerminate();
+  AliSelector::SlaveTerminate();
 
   // Add the histograms to the output on each slave server
   if (!fOutput)
@@ -241,7 +202,7 @@ void AlidNdEtaAnalysisESDSelector::Terminate()
   // a query. It always runs on the client, it can be used to present
   // the results graphically or save the results to file.
 
-  AliSelectorRL::Terminate();
+  AliSelector::Terminate();
 
   fdNdEtaAnalysis = dynamic_cast<dNdEtaAnalysis*> (fOutput->FindObject("dndeta"));
   fMult = dynamic_cast<TH1F*> (fOutput->FindObject("fMult"));