X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG%2FEMCAL%2FAliEmcalPicoTrackMaker.cxx;h=b62ce8c851620f824221baa8c4d1d92f3ebe6ec9;hb=0659d2e0b3292cf57fc627a68eb08bfc011b8aa6;hp=121f87c5e1d1dccd96427bfe1de12af531205dd6;hpb=71c1dd7613aa821d9bcf29b3b6a5dbc0729264e3;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG/EMCAL/AliEmcalPicoTrackMaker.cxx b/PWG/EMCAL/AliEmcalPicoTrackMaker.cxx
index 121f87c5e1d..b62ce8c8516 100644
--- a/PWG/EMCAL/AliEmcalPicoTrackMaker.cxx
+++ b/PWG/EMCAL/AliEmcalPicoTrackMaker.cxx
@@ -6,29 +6,27 @@
 
 #include <TClonesArray.h>
 #include <TRandom3.h>
-
 #include "AliAODEvent.h"
 #include "AliAODTrack.h"
 #include "AliAnalysisManager.h"
 #include "AliESDtrack.h"
 #include "AliESDtrackCuts.h"
+#include "AliEmcalPicoTrackMaker.h"
 #include "AliLog.h"
 #include "AliPicoTrack.h"
 #include "AliVTrack.h"
-#include "AliEmcalPicoTrackMaker.h"
 
 ClassImp(AliEmcalPicoTrackMaker)
 
 //________________________________________________________________________
 AliEmcalPicoTrackMaker::AliEmcalPicoTrackMaker() : 
   AliAnalysisTaskSE("AliEmcalPicoTrackMaker"),
-  fESDtrackCuts(0),
   fTracksOutName("PicoTracks"),
   fTracksInName("tracks"),
   fMinTrackPt(0),
   fMaxTrackPt(1000),
-  fMinTrackEta(-0.9),
-  fMaxTrackEta(0.9),
+  fMinTrackEta(-10),
+  fMaxTrackEta(10),
   fMinTrackPhi(-10),
   fMaxTrackPhi(10),
   fTrackEfficiency(1),
@@ -44,13 +42,12 @@ AliEmcalPicoTrackMaker::AliEmcalPicoTrackMaker() :
 //________________________________________________________________________
 AliEmcalPicoTrackMaker::AliEmcalPicoTrackMaker(const char *name) : 
   AliAnalysisTaskSE(name),
-  fESDtrackCuts(0),
   fTracksOutName("PicoTracks"),
   fTracksInName("tracks"),
   fMinTrackPt(0),
   fMaxTrackPt(1000),
-  fMinTrackEta(-0.9),
-  fMaxTrackEta(0.9),
+  fMinTrackEta(-10),
+  fMaxTrackEta(10),
   fMinTrackPhi(-10),
   fMaxTrackPhi(10),
   fTrackEfficiency(1),
@@ -109,14 +106,6 @@ void AliEmcalPicoTrackMaker::UserExec(Option_t *)
     InputEvent()->AddObject(fTracksOut);
   }
 
-  // clear container (normally a null operation as the event should clean it already)
-  fTracksOut->Clear();
-
-  // test if we are in ESD or AOD mode
-  Bool_t esdMode = kTRUE;
-  if (dynamic_cast<AliAODEvent*>(InputEvent())!=0)
-    esdMode = kFALSE;
- 
   // loop over tracks
   const Int_t Ntracks = fTracksIn->GetEntriesFast();
   for (Int_t iTracks = 0, nacc = 0; iTracks < Ntracks; ++iTracks) {
@@ -133,53 +122,29 @@ void AliEmcalPicoTrackMaker::UserExec(Option_t *)
 	track->Phi() < fMinTrackPhi || track->Phi() > fMaxTrackPhi)
       continue;
 
-    Bool_t isEmc = kFALSE;
-    Int_t label = -1;
-    if (esdMode) {
-      if (fESDtrackCuts) {
-        AliESDtrack *esdtrack = static_cast<AliESDtrack*>(track);
-        if (!fESDtrackCuts->AcceptTrack(esdtrack))
-          continue;
-      }
-      label = track->GetLabel();
-      isEmc = track->IsEMCAL();
-    } else {
-      AliAODTrack *aodtrack = static_cast<AliAODTrack*>(track);
-      if (fAODfilterBits[0] < 0) {
-	if (aodtrack->IsHybridGlobalConstrainedGlobal())
-	  label = 3;
-	else /*not a good track*/
-	  continue;
-      }
-      else {
-	if (aodtrack->TestFilterBit(fAODfilterBits[0]))
-	  label = 0;
-	else if (aodtrack->TestFilterBit(fAODfilterBits[1]))
-	  label = 3;
-	else /*not a good track*/
-	  continue;
-      }
-
-      if (TMath::Abs(track->GetTrackEtaOnEMCal()) < 0.75 && 
-	  track->GetTrackPhiOnEMCal() > 70 * TMath::DegToRad() && 
-	  track->GetTrackPhiOnEMCal() < 190 * TMath::DegToRad())
-	isEmc = kTRUE;
-    }
-
     if (fTrackEfficiency < 1) {
       Double_t r = gRandom->Rndm();
       if (fTrackEfficiency < r) 
 	continue;
     }
 
-    /*AliPicoTrack *picotrack =*/ new ((*fTracksOut)[nacc]) AliPicoTrack(track->Pt(), 
-                                                                     track->Eta(), 
-                                                                     track->Phi(), 
-                                                                     track->Charge(), 
-                                                                     label, 
-                                                                     track->GetTrackEtaOnEMCal(), 
-                                                                     track->GetTrackPhiOnEMCal(), 
-                                                                     isEmc);
+    Bool_t isEmc = kFALSE;
+    if (TMath::Abs(track->GetTrackEtaOnEMCal()) < 0.75 && 
+	track->GetTrackPhiOnEMCal() > 70 * TMath::DegToRad() &&
+	track->GetTrackPhiOnEMCal() < 190 * TMath::DegToRad())
+      isEmc = kTRUE;
+
+    AliPicoTrack *picotrack = new ((*fTracksOut)[nacc]) AliPicoTrack(track->Pt(), 
+								     track->Eta(), 
+								     track->Phi(), 
+								     track->Charge(), 
+								     track->GetLabel(),
+								     AliPicoTrack::GetTrackType(track),
+								     track->GetTrackEtaOnEMCal(), 
+								     track->GetTrackPhiOnEMCal(), 
+								     track->GetTrackPtOnEMCal(), 
+								     isEmc);
+    picotrack->SetTrack(track);
     ++nacc;
   }
 }