X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCComparison.C;h=3c40e2e680c9fd1a2cf130781e4019eba0bb6745;hb=c6f3749a0b5cf5b200db1f75312f26ce55387701;hp=41c708c5c83ad17ecdaaef30cbea905f7649e17d;hpb=4fa1e6291d9ab876a2071941429efeaf1799d8fb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCComparison.C b/TPC/AliTPCComparison.C
index 41c708c5c83..3c40e2e680c 100644
--- a/TPC/AliTPCComparison.C
+++ b/TPC/AliTPCComparison.C
@@ -22,7 +22,7 @@
   #include <TText.h>
   #include <TBenchmark.h>
   #include <TStyle.h>
-  #include <TKey.h>
+  #include <TFile.h>
   #include <TROOT.h>
 
   #include "AliStack.h"
@@ -30,7 +30,8 @@
   #include "AliTrackReference.h"
   #include "AliRunLoader.h"
   #include "AliRun.h"
-  #include "AliESD.h"
+  #include "AliESDEvent.h"
+  #include "AliESDtrack.h"
 
   #include "AliSimDigits.h"
   #include "AliTPC.h"
@@ -146,17 +147,20 @@ Int_t AliTPCComparison
          return 5;
       }
    }
-   TKey *key=0;
-   TIter next(ef->GetListOfKeys());
+   AliESDEvent* event = new AliESDEvent();
+   TTree* esdTree = (TTree*) ef->Get("esdTree");
+   if (!esdTree) {
+      ::Error("AliTPCComparison.C", "no ESD tree found");
+      return 6;
+   }
+   event->ReadFromTree(esdTree);
 
 
    //******* Loop over events *********
    Int_t e=0;
-   while ((key=(TKey*)next())!=0) {
+   while (esdTree->GetEvent(e)) {
       cout<<endl<<endl<<"********* Processing event number: "<<e<<"*******\n";
 
-      AliESD *event=(AliESD*)key->ReadObj();
-
       Int_t nentr=event->GetNumberOfTracks();
       allfound+=nentr;
 
@@ -271,9 +275,10 @@ Int_t AliTPCComparison
       cout<<"Number of \"good\" tracks ="<<ngood<<endl;
 
       refs->Clear();
-      delete event;
   }// ***** End of the loop over events
 
+   delete event;
+   delete esdTree;
    ef->Close();
 
    delete tpcTree;
@@ -564,7 +569,7 @@ Int_t GoodTracksTPC(const Char_t *dir) {
 
      //**** check if there is also information at the entrance of the TPC
      TTree *TR=rl->TreeTR();
-     TBranch *branch=TR->GetBranch("TPC");
+     TBranch *branch=TR->GetBranch("TrackReferences");
      if (branch==0) {
         ::Error("GoodTracksTPC","No track references !");
         delete rl;
@@ -576,8 +581,18 @@ Int_t GoodTracksTPC(const Char_t *dir) {
      for (Int_t r=0; r<nr; r++) {
          //cerr<<r<<' '<<nr<<'\r';
          TR->GetEvent(r);
-         if (tpcRefs->GetEntriesFast()==0) continue;
-         AliTrackReference *tpcRef=(AliTrackReference*)tpcRefs->UncheckedAt(0);
+
+	 Int_t nref = tpcRefs->GetEntriesFast();
+         if (!nref) continue;
+         AliTrackReference *tpcRef= 0x0;	 
+	 for (Int_t iref=0; iref<nref; ++iref) {
+	   tpcRef = (AliTrackReference*)tpcRefs->UncheckedAt(iref);
+	   if (tpcRef->DetectorId() == AliTrackReference::kTPC) break;
+	   tpcRef = 0x0;
+	 }
+
+	 if (!tpcRef) continue;
+
          Int_t j;
 	 AliTrackReference *ref=0;
          for (j=0; j<nt; j++) {