]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HLT/src/AliL3Evaluate.cxx
Some changes resulting from last week work. The mc stuff has been removed.
[u/mrichter/AliRoot.git] / HLT / src / AliL3Evaluate.cxx
index 6da45d54d871ce062237f98eb6c070fd5b9441cf..2707a6a4a90c9b635b2f7b515c5d2e77612a1244 100644 (file)
@@ -1,39 +1,62 @@
-//Author:        Anders Strand Vestbo
-//Last Modified: 5.01.2001
+//$Id$
 
-#include <stdio.h>
+// Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
+//*-- Copyright &copy ASV 
+
+#include "AliL3StandardIncludes.h"
 #include <TFile.h>
 #include <TH1.h>
 #include <TParticle.h>
 #include <TTree.h>
 #include <TClonesArray.h>
 
-#include "AliRun.h"
-#include "AliSimDigits.h"
-#include "AliTPC.h"
-#include "AliTPCClustersArray.h"
-#include "AliTPCClustersRow.h"
-#include "AliTPCcluster.h"
-#include "AliTPCParam.h"
+#include <AliRun.h>
+#include <AliSimDigits.h>
+#include <AliTPC.h>
+#include <AliTPCcluster.h>
+#include <AliTPCClustersArray.h>
+#include <AliTPCClustersRow.h>
+#include <AliTPCParam.h>
+#include <AliComplexCluster.h>
+
+#if GCCVERSION == 3
+#include <fstream>
+#include <iosfwd>
+#else
+#include <fstream.h>
+#endif
 
+#include "AliL3Logging.h"
 #include "AliL3Transform.h"
 #include "AliL3SpacePointData.h"
 #include "AliL3Track.h"
 #include "AliL3FileHandler.h"
 #include "AliL3TrackArray.h"
 #include "AliL3Evaluate.h"
-#include "AliL3Logging.h"
 
-//AliL3Evaluate
-//Class for tracking evaluation.
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
+//_____________________________________________________________
+// AliL3Evaluate
+//
+// Evaluation class for tracking. Plots efficiencies etc..
+//
+
 
 ClassImp(AliL3Evaluate)
 
 AliL3Evaluate::AliL3Evaluate()
 {
-  fMCFile = NULL;
+  fDigitsFile = NULL;
   fTracks = NULL;
   fMCclusterfile = NULL;
+  fNFastPoints = 0;
+  fMcIndex = 0;
+  fMcId = 0;
+  fMinSlice=0;
+  fMaxSlice=0;
 }
 
 AliL3Evaluate::AliL3Evaluate(Char_t *mcfile,Int_t *slice)
@@ -41,73 +64,62 @@ AliL3Evaluate::AliL3Evaluate(Char_t *mcfile,Int_t *slice)
   //Normal constructor. Input are the rootfile containing the 
   //original MC information of the simulated event. 
 
-  fMCFile = new TFile(mcfile,"READ");
-  if(!fMCFile->IsOpen())
-    {
-      LOG(AliL3Log::kError,"AliL3Evaluation::AliL3Evaluation","File Open")
-       <<"Inputfile "<<mcfile<<" does not exist"<<ENDLOG;
-      return;
-    }
-  
-  fParam = (AliTPCParam*)fMCFile->Get("75x40_100x60");
-  fTransform = new AliL3Transform();
+  fEventFile = new TFile(mcfile,"READ");
+    
+  fParam = (AliTPCParam*)fEventFile->Get(AliL3Transform::GetParamName());
   
   fMinSlice = slice[0];
   fMaxSlice = slice[1];
+  fMinGoodPt = 0.1;
+  fNoOverlap = kFALSE;
+}
 
+AliL3Evaluate::AliL3Evaluate(Int_t *slice)
+{
+  //ctor to use if you do not need any rootfile.
+
+  fMinSlice = slice[0];
+  fMaxSlice = slice[1];
 }
 
 AliL3Evaluate::~AliL3Evaluate()
 {
-  if(fDigitsTree) 
-    fDigitsTree->Delete();
-  
-
-  /*if(fMCFile) 
-    {
-      fMCFile->Close();
-      delete fMCFile;
-    }
-  */
-  if(fTransform)
-    delete fTransform;
-  if(fTracks)
-    delete fTracks;
-  if(fPtRes)
-    delete fPtRes;
-  if(fNGoodTracksPt)
-    delete fNGoodTracksPt;
-  if(fNFoundTracksPt)
-    delete fNFoundTracksPt;
-  if(fNFakeTracksPt)
-    delete fNFakeTracksPt;
-  if(fTrackEffPt)
-    delete fTrackEffPt;
-  if(fFakeTrackEffPt)
-    delete fFakeTrackEffPt;
-  if(fNGoodTracksEta)
-    delete fNGoodTracksEta;
-  if(fNFoundTracksEta)
-    delete fNFoundTracksEta;
-  if(fNFakeTracksEta)
-    delete fNFakeTracksEta;
-  if(fTrackEffEta)
-    delete fTrackEffEta;
-  if(fFakeTrackEffEta)
-    delete fFakeTrackEffEta;
+  if(fDigitsTree) fDigitsTree->Delete();
+  if(fDigitsFile) {
+    fDigitsFile->Close();
+    delete fDigitsFile;
+  }
+  if(fTracks) delete fTracks;
+  if(fPtRes) delete fPtRes;
+  if(fNGoodTracksPt) delete fNGoodTracksPt;
+  if(fNFoundTracksPt) delete fNFoundTracksPt;
+  if(fNFakeTracksPt) delete fNFakeTracksPt;
+  if(fTrackEffPt) delete fTrackEffPt;
+  if(fFakeTrackEffPt) delete fFakeTrackEffPt;
+  if(fNGoodTracksEta) delete fNGoodTracksEta;
+  if(fNFoundTracksEta) delete fNFoundTracksEta;
+  if(fNFakeTracksEta) delete fNFakeTracksEta;
+  if(fTrackEffEta) delete fTrackEffEta;
+  if(fFakeTrackEffEta) delete fFakeTrackEffEta;
+  if(fMcIndex) delete [] fMcIndex;
+  if(fMcId)    delete [] fMcId;
+  if(fNtuppel) delete fNtuppel;
 }
 
 void AliL3Evaluate::Setup(Char_t *trackfile,Char_t *path)
 {
   //Read in the hit and track information from produced files.
+  AliL3Transform::Init(path);
   
+  fGoodFound = 0;
+  fGoodGen = 0;
   Char_t fname[256];
-  AliL3FileHandler *clusterfile[36][5];
+  AliL3FileHandler *clusterfile[36][6];
   for(Int_t s=fMinSlice; s<=fMaxSlice; s++)
     {
-      for(Int_t p=0; p<5; p++)
+      for(Int_t p=0; p<6; p++)
        {
-          fClusters[s][p] = 0;
+         fClusters[s][p] = 0;
          clusterfile[s][p] = new AliL3FileHandler();
          sprintf(fname,"%s/points_%d_%d.raw",path,s,p);
          if(!clusterfile[s][p]->SetBinaryInput(fname))
@@ -123,7 +135,7 @@ void AliL3Evaluate::Setup(Char_t *trackfile,Char_t *path)
          clusterfile[s][p]->CloseBinaryInput();
        }
     }
-  
+
   
   AliL3FileHandler *tfile = new AliL3FileHandler();
   if(!tfile->SetBinaryInput(trackfile)){
@@ -137,26 +149,34 @@ void AliL3Evaluate::Setup(Char_t *trackfile,Char_t *path)
   delete tfile;
 }
 
-void AliL3Evaluate::SetupSlow(Char_t *trackfile,Char_t *path)
+void AliL3Evaluate::SetupSlow(Char_t *trackfile,Char_t *digitsfile,Char_t *path)
 {
   //Setup for using the slow simulator.
+  AliL3Transform::Init(path);
   
+  fDigitsFile = new TFile(digitsfile,"READ");
+  if(!fDigitsFile->IsOpen())
+    {
+      LOG(AliL3Log::kError,"AliL3Evaluate::SetupSlow","File Open")
+       <<"Inputfile "<<digitsfile<<" does not exist"<<ENDLOG;
+      return;
+    }
   fIsSlow = true;
   Setup(trackfile,path);
   
-  if(!SetDigitsTree())
+  if(!InitMC())
     LOG(AliL3Log::kError,"AliL3Evaluation::SetupSlow","Digits Tree")
     <<"Error setting up digits tree"<<ENDLOG;
-  if(!SetMCParticleArray())
-    LOG(AliL3Log::kError,"AliL3Evaluation::Setup","Particle array")
-    <<"Error setting up particle array"<<ENDLOG;
+  
 }
 
 void AliL3Evaluate::SetupFast(Char_t *trackfile,Char_t *mcClusterfile,Char_t *path)
 {
   //Setup for using the fast simulator.
+  AliL3Transform::Init(path);
 
   fIsSlow = false;
+  GetFastClusterIDs(path);
   
   fMCclusterfile = new TFile(mcClusterfile);
   if(!fMCclusterfile->IsOpen())
@@ -164,85 +184,88 @@ void AliL3Evaluate::SetupFast(Char_t *trackfile,Char_t *mcClusterfile,Char_t *pa
       <<"Inputfile "<<mcClusterfile<<" does not exist"<<ENDLOG; 
 
   Setup(trackfile,path);
-
-  if(!SetMCParticleArray())
-    LOG(AliL3Log::kError,"AliL3Evaluation::SetupFast","Particle array")
-      <<"Error setting up particle array"<<ENDLOG;
-}
-
-void AliL3Evaluate::CreateHistos(Int_t nbin,Int_t xlow,Int_t xup)
-{
-  //Create the histograms 
-  
-  fPtRes = new TH1F("fPtRes","Relative Pt resolution",30,-10.,10.); 
-  fNGoodTracksPt = new TH1F("fNGoodTracksPt","Good tracks vs pt",nbin,xlow,xup);    
-  fNFoundTracksPt = new TH1F("fNFoundTracksPt","Found tracks vs pt",nbin,xlow,xup);
-  fNFakeTracksPt = new TH1F("fNFakeTracksPt","Fake tracks vs pt",nbin,xlow,xup);
-  fTrackEffPt = new TH1F("fTrackEffPt","Tracking efficiency vs pt",nbin,xlow,xup);
-  fFakeTrackEffPt = new TH1F("fFakeTrackEffPt","Efficiency for fake tracks vs pt",nbin,xlow,xup);
-  
-  fNGoodTracksEta = new TH1F("fNGoodTracksEta","Good tracks vs eta",20,-50,50);
-  fNFoundTracksEta = new TH1F("fNFoundTracksEta","Found tracks vs eta",20,-50,50);
-  fNFakeTracksEta = new TH1F("fNFakeTracksEta","Fake tracks vs eta",20,-50,50);
-  fTrackEffEta = new TH1F("fTrackEffEta","Tracking efficienct vs eta",20,-50,50);
-  fFakeTrackEffEta = new TH1F("fFakeTrackEffEta","Efficiency for fake tracks vs eta",20,-50,50);
-
+  InitMC();
 }
 
-Bool_t AliL3Evaluate::SetDigitsTree()
+Bool_t AliL3Evaluate::InitMC()
 {
-
-  fMCFile->cd();
-  fDigitsTree = (TTree*)fMCFile->Get("TreeD_75x40_100x60");
-  if(!fDigitsTree) return false;
-  fDigitsTree->GetBranch("Segment")->SetAddress(&fDigits);
-  for(Int_t i=0; i<fDigitsTree->GetEntries(); i++)
+  if(fIsSlow)
     {
-      if(!fDigitsTree->GetEvent(i)) continue;
-      Int_t se,ro,slice,slicerow;
-      fParam->AdjustSectorRow(fDigits->GetID(),se,ro);
-      fTransform->Sector2Slice(slice,slicerow,se,ro);
-      fRowid[slice][slicerow] = i;
+      Char_t dname[100];
+      sprintf(dname,"TreeD_%s_0",AliL3Transform::GetParamName());
+      fDigitsFile->cd();
+      fDigitsTree = (TTree*)fDigitsFile->Get(dname);
+      if(!fDigitsTree) 
+       {
+         LOG(AliL3Log::kError,"AliL3Evaluate::InitMC","Digits Tree")
+           <<AliL3Log::kHex<<"Error getting digitstree "<<(Int_t)fDigitsTree<<ENDLOG;
+         return false;
+       }
+      fDigitsTree->GetBranch("Segment")->SetAddress(&fDigits);
+      for(Int_t i=0; i<fDigitsTree->GetEntries(); i++)
+       {
+         if(!fDigitsTree->GetEvent(i)) continue;
+         Int_t se,ro,slice,slicerow;
+         fParam->AdjustSectorRow(fDigits->GetID(),se,ro);
+         AliL3Transform::Sector2Slice(slice,slicerow,se,ro);
+         fRowid[slice][slicerow] = i;
+       }
     }
   
-  return true;
-}
-
-Bool_t AliL3Evaluate::SetMCParticleArray()
-{
-  fMCFile->cd();
-  AliRun *gAlice = (AliRun*)fMCFile->Get("gAlice");
+  fEventFile->cd();
+  gAlice = (AliRun*)fEventFile->Get("gAlice");
   if (!gAlice) 
     {
-      LOG(AliL3Log::kError,"AliL3Evaluate::SetParticleArray","gAlice")
+      LOG(AliL3Log::kError,"AliL3Evaluate::InitMC","gAlice")
        <<"AliRun object non existing on file"<<ENDLOG;
       return false;
     }
   
   gAlice->GetEvent(0);
-  fParticles=gAlice->Particles(); 
+  
   return true;
+  
 }
 
-
-TObjArray *AliL3Evaluate::DefineGoodTracks(Int_t slice,Int_t *padrow,Int_t good_number,Int_t *particle_id)
+void AliL3Evaluate::DefineGoodTracks(Int_t *slice,Int_t *padrow,Int_t good_number,Char_t *fname)
 {
   //Loop over MC particles, and mark the good ones
   //(which the tracker should find...)
-
-  Int_t np=fParticles->GetEntriesFast();
+  
+  
+  ifstream in(fname);
+  if(in)
+    {
+      LOG(AliL3Log::kInformational,"AliL3Evaluate::DefineGoodTracks","infile")
+       <<"Reading good particles from file "<<fname<<ENDLOG;
+      while (in>>fGoodTracks[fGoodGen].label>>fGoodTracks[fGoodGen].code>>
+            fGoodTracks[fGoodGen].px>>fGoodTracks[fGoodGen].py>>fGoodTracks[fGoodGen].pz>>
+            fGoodTracks[fGoodGen].pt) 
+       {
+         fGoodGen++;
+         if (fGoodGen==15000) 
+           {
+             LOG(AliL3Log::kWarning,"AliL3Evaluate::DefineGoodTracks","fGoodGen")
+               <<"Too many good tracks"<<ENDLOG;
+             break;
+           }
+       }
+      if (!in.eof()) cerr<<"Read error (good_tracks_tpc) !\n";
+      return;
+    }
+  
+  
   AliTPC *TPC = (AliTPC*)gAlice->GetDetector("TPC");
+  
   TPC->SetParam(fParam);
+  
   Int_t ver = TPC->IsVersion();
   LOG(AliL3Log::kInformational,"AliL3Evaluate::DefineGoodTracks","TPC version")
     <<"TPC version "<<ver<<" found on file"<<ENDLOG;
   
-  //Int_t nrow_up=TPC->GetParam()->GetNRowUp();
-  //Int_t nrows=TPC->GetParam()->GetNRowLow()+nrow_up;
   Int_t zero=TPC->GetParam()->GetZeroSup();
   
-  //Int_t number_of_rows = padrow[1] - padrow[0] + 1;
-  
+  Int_t np = gAlice->GetNtrack();
   Int_t *good = new Int_t[np];
   for(Int_t ii=0; ii<np; ii++)
     good[ii] = 0;
@@ -256,19 +279,22 @@ TObjArray *AliL3Evaluate::DefineGoodTracks(Int_t slice,Int_t *padrow,Int_t good_
       AliTPCClustersArray carray;
       carray.Setup(fParam);
       carray.SetClusterType("AliTPCcluster");
-      Bool_t clusterok = carray.ConnectTree("Segment Tree");
+      Char_t cname[100];
+      Int_t eventn = 0;
+      sprintf(cname,"TreeC_TPC_%d",eventn);
+      Bool_t clusterok = carray.ConnectTree(cname);
       if(!clusterok) 
        LOG(AliL3Log::kError,"AliL3Evaluate::DefineGoodTracks","Cluster Array")
          <<"Error loading clusters from rootfile"<<ENDLOG;
-            
+         
       for(Int_t i=0; i<carray.GetTree()->GetEntries(); i++)  
        {
          Int_t sec,row,sl,lr;
          AliSegmentID *s = carray.LoadEntry(i);
          fParam->AdjustSectorRow(s->GetID(),sec,row);
-         fTransform->Sector2Slice(sl,lr,sec,row);
+         AliL3Transform::Sector2Slice(sl,lr,sec,row);
          
-         if(sl != slice) {carray.ClearRow(sec,row); continue;}
+         if(sl != slice[0]) {carray.ClearRow(sec,row); continue;}
          if(lr < padrow[0]) {carray.ClearRow(sec,row); continue;}
          if(lr > padrow[1]) {carray.ClearRow(sec,row); continue;}
          AliTPCClustersRow *cRow = carray.GetRow(sec,row);
@@ -291,85 +317,138 @@ TObjArray *AliL3Evaluate::DefineGoodTracks(Int_t slice,Int_t *padrow,Int_t good_
          <<"TPC version "<<ver<<" does not match."<<ENDLOG;
       Int_t *count = new Int_t[np]; //np number of particles.
       Int_t i;
+      Float_t xyz[3];
       for (i=0; i<np; i++) count[i]=0;
-      for (i=padrow[0]; i<=padrow[1]; i++) {
-       Int_t index = fRowid[slice][i];
-       if (!fDigitsTree->GetEvent(index)) continue;
-       Int_t sec,row;
-       fParam->AdjustSectorRow(fDigits->GetID(),sec,row);
-       fDigits->First();
-       while (fDigits->Next()) {
-         Int_t it=fDigits->CurrentRow(), ip=fDigits->CurrentColumn();
-         Short_t dig = fDigits->GetDigit(it,ip);
-         Int_t idx0=fDigits->GetTrackID(it,ip,0); 
-         Int_t idx1=fDigits->GetTrackID(it,ip,1);
-         Int_t idx2=fDigits->GetTrackID(it,ip,2);
-         if (idx0>=0 && dig>=zero) count[idx0]+=1;
-         if (idx1>=0 && dig>=zero) count[idx1]+=1;
-         if (idx2>=0 && dig>=zero) count[idx2]+=1;
-       }
-       for (Int_t j=0; j<np; j++) {
-         if (count[j]>1) {//at least two digits at this padrow 
-           good[j]++;
+      for(Int_t sl=slice[0]; sl<=slice[1]; sl++)
+       {
+         for (i=padrow[0]; i<=padrow[1]; i++) {
+           Int_t index = fRowid[sl][i];
+           if (!fDigitsTree->GetEvent(index)) continue;
+           Int_t sec,row;
+           fParam->AdjustSectorRow(fDigits->GetID(),sec,row);
+           fDigits->First();
+           do {
+             Int_t it=fDigits->CurrentRow(), ip=fDigits->CurrentColumn();
+             Short_t dig = fDigits->GetDigit(it,ip);
+             
+             if(dig<=fParam->GetZeroSup()) continue;
+             /*
+               if(it < fParam->GetMaxTBin()-1 && it > 0)
+               if(fDigits->GetDigit(it+1,ip) <= fParam->GetZeroSup()
+               && fDigits->GetDigit(it-1,ip) <= fParam->GetZeroSup())
+               continue;
+             */
+             AliL3Transform::Raw2Local(xyz,sec,row,ip,it);
+             if(fParam->GetPadRowRadii(sec,row)<230./250.*fabs(xyz[2]))
+               continue;
+             
+             Int_t idx0=fDigits->GetTrackID(it,ip,0); 
+             Int_t idx1=fDigits->GetTrackID(it,ip,1);
+             Int_t idx2=fDigits->GetTrackID(it,ip,2);
+
+             if (idx0>=0 && dig>=zero) count[idx0]+=1;
+             if (idx1>=0 && dig>=zero) count[idx1]+=1;
+             if (idx2>=0 && dig>=zero) count[idx2]+=1;
+           } while (fDigits->Next());
+           
+           for (Int_t j=0; j<np; j++) 
+             {
+               if (count[j]>1) //at least two digits at this padrow 
+                 good[j]++;
+               
+               count[j]=0;
+             }
          }
-         count[j]=0;
        }
-      }
       delete[] count;
     }
+  
   else 
     {
       LOG(AliL3Log::kError,"AliL3Evaluation::FillEffHistos","TPC version")
        <<"No valid TPC version found"<<ENDLOG;
-      return 0;
+      return;
+    }
+  
+  
+  //The following code has been taken from offlinemacro->AliTPCComparison.C
+  
+  TTree *TH=gAlice->TreeH();
+  Int_t npart=(Int_t)TH->GetEntries();
+  Int_t max = 15000;
+  while (npart--) {
+    AliTPChit *hit0=0;
+    
+    TPC->ResetHits();
+    TH->GetEvent(npart);
+    AliTPChit * hit = (AliTPChit*) TPC->FirstHit(-1);
+    while (hit){
+      if (hit->fQ==0.) break;
+      hit =  (AliTPChit*) TPC->NextHit();
     }
+    if (hit) {
+      hit0 = new AliTPChit(*hit); //Make copy of hit
+      hit = hit0;
+    }
+    else continue;
+    AliTPChit *hit1=(AliTPChit*)TPC->NextHit();       
+    if (hit1==0) continue;
+    if (hit1->fQ != 0.) continue;
+    Int_t i=hit->Track();
+    TParticle *p = (TParticle*)gAlice->Particle(i);
+    
+    //printf("Checking particle %d with code %d\n",i,p->GetPdgCode());
+    if (p->GetFirstMother()>=0) continue;  //secondary particle
+    if (good[i] < good_number || good[i]>176) continue;
+    if (p->Pt()<fMinGoodPt) continue;
+    if (TMath::Abs(p->Pz()/p->Pt())>0.999) continue;
+    printf("Found good particle %d, nHits %d\n",i,good[i]);
+    
+    fGoodTracks[fGoodGen].label=i;
+    fGoodTracks[fGoodGen].code=p->GetPdgCode();
+    //**** px py pz - in global coordinate system, x y z - in local !
+    fGoodTracks[fGoodGen].px=hit->X(); fGoodTracks[fGoodGen].py=hit->Y(); fGoodTracks[fGoodGen].pz=hit->Z();
+    fGoodTracks[fGoodGen].pt = p->Pt();
+    fGoodGen++;
+    //nt++;     
+    if (hit0) delete hit0;
+    if (fGoodGen==max) {cerr<<"Too many good tracks !n"; break;}
+  }
   
-  Float_t torad=TMath::Pi()/180;
-  
-  Float_t phi_min = slice*20 - 10;
-  Float_t phi_max = slice*20 + 10;
-  TObjArray *good_part = new TObjArray();
-  
-  for(Int_t i=0; i<fParticles->GetEntriesFast(); i++)
-   {
-     TParticle *p = (TParticle*)fParticles->UncheckedAt(i);
-     if(p->GetFirstMother()>0) continue; //secondary particle
-     if(good[i] < good_number) {continue;}
-     
-     Double_t ptg=p->Pt(),pxg=p->Px(),pyg=p->Py(),pzg=p->Pz();
-     Double_t phi_part = TMath::ATan2(pyg,pxg);
-     if (phi_part < 0) phi_part += 2*TMath::Pi();
-     
-
-     if(phi_part < phi_min*torad || phi_part > phi_max*torad) {continue;}
-     if(ptg<0.100) continue;
-     if(fabs(pzg/ptg)>0.999) {continue;}
-     Int_t entries = good_part->GetEntriesFast();
-     good_part->AddLast(p);
-     particle_id[entries] = i;
-   }
   delete [] good;
-  LOG(AliL3Log::kInformational,"AliL3Evaluate::DefineGoodTracks","NPart")
-  <<AliL3Log::kDec<<"Found "<<good_part->GetEntriesFast()
-  <<" good Particles (Tracks) out of "<<fParticles->GetEntriesFast()<<ENDLOG;
-
-  return good_part;
+  
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::DefineGoodParticles","Eval")
+    <<AliL3Log::kDec<<"Found "<<fGoodGen<<"good tracks"<<ENDLOG;
+  
+  ofstream out(fname);
+  if(out) 
+    {
+      for (Int_t ngd=0; ngd<fGoodGen; ngd++)            
+       out<<fGoodTracks[ngd].label<<' '<<fGoodTracks[ngd].code<<' '<<
+         fGoodTracks[ngd].px<<' '<<fGoodTracks[ngd].py<<' '<<fGoodTracks[ngd].pz<<' '<<
+         fGoodTracks[ngd].pt<<endl; 
+      
+    } 
+  else
+    LOG(AliL3Log::kError,"AliL3Evaluate::DefineGoodParticles","file")
+      <<"Can not open file containing good tracks"<<ENDLOG;
+  
+  out.close();
+  
 }
 
 void AliL3Evaluate::EvaluatePatch(Int_t slice,Int_t patch,Int_t min_points,Int_t good_number)
 {
   //Make efficiency plots for tracking on patch level (before any merging).
   
-  Int_t row[5][2] = {{ 0, 45},{46,77},{78,109},{110,141},{142,173}};
-  Int_t *particle_id = new Int_t[fParticles->GetEntriesFast()];
-  TObjArray *good_particles = DefineGoodTracks(slice,row[patch],good_number,particle_id);
+  Int_t row[6][2] = {{ 0, 45},{46,77},{78,109},{110,141},{142,175}};
+  Int_t sl[2] ={slice,slice};
+  DefineGoodTracks(sl,row[patch],good_number);
   SetMinPoints(min_points);
   AssignIDs();
   CreateHistos();
-  FillEffHistos(good_particles,particle_id);
+  FillEffHistos();
   CalcEffHistos();
-  delete good_particles;
-  delete [] particle_id;
 }
 
 void AliL3Evaluate::EvaluateSlice(Int_t slice,Int_t min_points,Int_t good_number)
@@ -378,167 +457,70 @@ void AliL3Evaluate::EvaluateSlice(Int_t slice,Int_t min_points,Int_t good_number
   //min_points = minimum points on track to be considered for evaluation
   //good_number = minimum hits (padrows) produced by simulated track for consideration.
 
-  Int_t row[2] = {0,173};
-  Int_t *particle_id = new Int_t[fParticles->GetEntriesFast()];
-  TObjArray *good_particles = DefineGoodTracks(slice,row,good_number,particle_id);
+  Int_t row[2] = {0,175};
+  Int_t sl[2] ={slice,slice};
+  DefineGoodTracks(sl,row,good_number);
+
   SetMinPoints(min_points);
+  
   AssignIDs();
   CreateHistos();
-  FillEffHistos(good_particles,particle_id);
+  FillEffHistos();
   CalcEffHistos();
-  delete good_particles;
-  delete [] particle_id;
 }
 
-void AliL3Evaluate::EvaluateGlobal(Int_t min_points,Int_t good_number)
+void AliL3Evaluate::EvaluateGlobal(Int_t min_points,Int_t good_number,Char_t *fname)
 {
   //Make efficiency plots for tracking on several slices.
   
-  Int_t row[2] = {0,173};
-  Int_t *particle_id = new Int_t[fParticles->GetEntriesFast()];
+  Int_t row[2] = {AliL3Transform::GetFirstRow(0),AliL3Transform::GetLastRow(5)};
   SetMinPoints(min_points);
+  Int_t slice[2] = {fMinSlice,fMaxSlice};
+  DefineGoodTracks(slice,row,good_number,fname);
   AssignIDs();
-  CreateHistos();
-  for(Int_t slice=fMinSlice;slice<=fMaxSlice;slice++){
-    TObjArray *good_particles = DefineGoodTracks(slice,row,good_number,particle_id);
-    FillEffHistos(good_particles,particle_id);
-    delete good_particles;
-  }
+  CreateHistos(5,0,2);
+  printf("filling histos\n");
+  FillEffHistos();
+  printf("done fillling\n");
   CalcEffHistos();
 }
 
-void AliL3Evaluate::FillEffHistos(TObjArray *good_particles,Int_t *particle_id)
-{  
-  //Fill the efficiency histograms.
-
-  for(Int_t i=0; i<good_particles->GetEntriesFast(); i++)
-    {
-      TParticle *p = (TParticle*)good_particles->UncheckedAt(i);
-      Double_t ptg=p->Pt(),pzg=p->Pz();
-      Float_t dipangle=TMath::ATan2(pzg,ptg)*180./TMath::Pi();
-      fNGoodTracksPt->Fill(ptg);
-      fNGoodTracksEta->Fill(dipangle);
-      Int_t found = 0;
-      for(Int_t k=0; k<fTracks->GetNTracks(); k++)
-       {
-         AliL3Track *track = fTracks->GetCheckedTrack(k);
-         if(!track) continue;
-         Int_t nHits = track->GetNumberOfPoints();
-         if(nHits < fMinPointsOnTrack) break;
-         
-         Int_t tracklabel;
-         tracklabel = track->GetMCid();
-         
-         if(TMath::Abs(tracklabel) != particle_id[i]) continue;
-         found=1;
-         if(tracklabel == particle_id[i]) {fNFoundTracksPt->Fill(ptg); fNFoundTracksEta->Fill(dipangle);}
-         else {fNFakeTracksPt->Fill(ptg); fNFakeTracksEta->Fill(dipangle);}
-         Float_t pt=track->GetPt();
-         fPtRes->Fill((pt-ptg)/ptg*100.);
-         break;
-         
-       }
-    }
-}
-
-void AliL3Evaluate::CalcEffHistos(){  
-  
-  Stat_t ngood=fNGoodTracksPt->GetEntries();
-  Stat_t nfound=fNFoundTracksPt->GetEntries();
-  Stat_t nfake=fNFakeTracksPt->GetEntries();
-  
-  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
-    <<AliL3Log::kDec<<"There was "<<ngood<<" generated good tracks"<<ENDLOG;
-  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
-    <<AliL3Log::kDec<<"Found "<<nfound<<" tracks"<<ENDLOG;
-  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
-    <<AliL3Log::kDec<<"Integral efficiency is about "<<nfound/ngood*100<<ENDLOG;
-  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
-    <<AliL3Log::kDec<<"Fake tracks relative is about "<<nfake/ngood*100<<ENDLOG;
-  
-  fNFoundTracksPt->Sumw2(); fNGoodTracksPt->Sumw2();
-  fTrackEffPt->Divide(fNFoundTracksPt,fNGoodTracksPt,1,1.,"b");
-  fFakeTrackEffPt->Divide(fNFakeTracksPt,fNGoodTracksPt,1,1.,"b");
-  fTrackEffPt->SetMaximum(1.4);
-  fTrackEffPt->SetXTitle("P_{T} [GeV]");
-  fTrackEffPt->SetLineWidth(2);
-  fFakeTrackEffPt->SetFillStyle(3013);
-  fTrackEffPt->SetLineColor(4);
-  fFakeTrackEffPt->SetFillColor(2);
-  
-  fNFoundTracksEta->Sumw2(); fNGoodTracksEta->Sumw2();
-  fTrackEffEta->Divide(fNFoundTracksEta,fNGoodTracksEta,1,1.,"b");
-  fFakeTrackEffEta->Divide(fNFakeTracksEta,fNGoodTracksEta,1,1.,"b");
-  fTrackEffEta->SetMaximum(1.4);
-  fTrackEffEta->SetXTitle("#lambda [degrees]");
-  fTrackEffEta->SetLineWidth(2);
-  fFakeTrackEffEta->SetFillStyle(3013);
-  fTrackEffEta->SetLineColor(4);
-  fFakeTrackEffEta->SetFillColor(2);
-       
-}
-
 void AliL3Evaluate::AssignIDs()
 {
   //Assign MC id to the tracks.
   
-  UInt_t *index=0,tmp_ind=0;
-  Int_t *pID=0,npoints=0;
-  
-  if(!fIsSlow)
-    {
-      pID = GetFastIDs(tmp_ind,npoints);
-      index = (UInt_t*)tmp_ind;
-    }
-  
   fTracks->QSort();
   LOG(AliL3Log::kDebug,"AliL3Evaluate::AssignIDs","Track Loop")
     <<"Assigning MC id to the found tracks...."<<ENDLOG;
   for(Int_t i=0; i<fTracks->GetNTracks(); i++)
     {
       AliL3Track *track = (AliL3Track*)fTracks->GetCheckedTrack(i);
-      if(!track) 
-       {
-         LOG(AliL3Log::kWarning,"AliL3Evaluate::AssignIDs","Track Loop")
-           <<AliL3Log::kDec<<"No track in track array, index "<<i<<ENDLOG;
-         continue;
-       }
+      if(!track) continue; 
       if(track->GetNumberOfPoints() < fMinPointsOnTrack) break;
-      Int_t tID;
-      if(!fIsSlow)
-       tID = GetMCTrackLabel(track,index,pID,npoints);
-      else
-       tID = GetMCTrackLabel(track);
+      
+      fGoodFound++;
+      Int_t tID = GetMCTrackLabel(track);
       track->SetMCid(tID);
-      printf("track %i id %d\n",i,tID);
+      printf("track %i id %d nHits %d\n",i,tID,track->GetNumberOfPoints());
     }
-  
-  if(pID)   delete [] pID;
-  if(index) delete [] index;
 }
 
 
 struct S {Int_t lab; Int_t max;};
-Int_t AliL3Evaluate::GetMCTrackLabel(AliL3Track *track,UInt_t *index,Int_t *pID,Int_t npoints) 
-{
+Int_t AliL3Evaluate::GetMCTrackLabel(AliL3Track *track){ 
   //Returns the MCtrackID of the belonging clusters.
   //If MCLabel < 0, means that track is fake.
   //Fake track means that more than 10 percent of clusters are assigned incorrectly.
   
+#ifdef do_mc
   Int_t num_of_clusters = track->GetNumberOfPoints();
   S *s=new S[num_of_clusters];
   Int_t i;
   for (i=0; i<num_of_clusters; i++) s[i].lab=s[i].max=0;
   UInt_t *hitnum = track->GetHitNumbers();  
   UInt_t id;
-
-  Int_t **trackID;
     
-  if(fIsSlow)
-    trackID = GetClusterIDs(track);
-  else
-    trackID = GetClusterIDs(track,index,pID,npoints);
-  
+  //Int_t **trackID = GetClusterIDs(track);
 
   Int_t lab=123456789;
   for (i=0; i<num_of_clusters; i++) 
@@ -550,10 +532,7 @@ Int_t AliL3Evaluate::GetMCTrackLabel(AliL3Track *track,UInt_t *index,Int_t *pID,
       UInt_t pos = id&0x3fffff;              
       
       AliL3SpacePointData *points = fClusters[slice][patch];
-      
-      if(!points) 
-       continue;
-      
+      if(!points) continue; 
       if(pos>=fNcl[slice][patch]) 
        {
          LOG(AliL3Log::kError,"AliL3Evaluate::GetMCTrackLabel","Clusterarray")
@@ -562,8 +541,8 @@ Int_t AliL3Evaluate::GetMCTrackLabel(AliL3Track *track,UInt_t *index,Int_t *pID,
        }
       
       //Get the label of the cluster:
-      //printf("label %d %d %d\n",trackID[i][0],trackID[i][1],trackID[i][2]);
-      lab=abs(trackID[i][0]);
+      
+      lab=abs(points[pos].fTrackID[0]);
       Int_t j;
       for (j=0; j<num_of_clusters; j++)
         if (s[j].lab==lab || s[j].max==0) break;
@@ -585,10 +564,7 @@ Int_t AliL3Evaluate::GetMCTrackLabel(AliL3Track *track,UInt_t *index,Int_t *pID,
       UInt_t pos = id&0x3fffff;              
       
       AliL3SpacePointData *points = fClusters[slice][patch];
-      
-      if(!points) 
-       continue;
-      
+      if(!points) continue; 
       if(pos>=fNcl[slice][patch]) 
        {
          LOG(AliL3Log::kError,"AliL3Evaluate::GetMCTrackLabel","Clusterarray")
@@ -596,8 +572,8 @@ Int_t AliL3Evaluate::GetMCTrackLabel(AliL3Track *track,UInt_t *index,Int_t *pID,
          continue;
        }
       
-      if (abs(trackID[i][1]) == lab || 
-         abs(trackID[i][2]) == lab ) max++;
+      if (abs(points[pos].fTrackID[1]) == lab || 
+         abs(points[pos].fTrackID[2]) == lab ) max++;
     }
   
   //check if more than 10% of the clusters are incorrectly assigned (fake track):
@@ -606,24 +582,25 @@ Int_t AliL3Evaluate::GetMCTrackLabel(AliL3Track *track,UInt_t *index,Int_t *pID,
       return -lab;
     }
   
-  delete [] trackID;
   return lab;
-}
+#else //If we are running with mc_ids or not
+  return 0;
+#endif
 
+}
 
-Int_t **AliL3Evaluate::GetClusterIDs(AliL3Track *track,UInt_t *index,Int_t *pID,Int_t npoints)
+Int_t **AliL3Evaluate::GetClusterIDs(AliL3Track *track)
 {
   //Return the MC information of all clusters belonging to track.
-  
+
   Int_t num_of_clusters = track->GetNumberOfPoints();
   Int_t **trackID = new Int_t*[num_of_clusters];
   
   UInt_t *hitnum = track->GetHitNumbers();  
   UInt_t id;
-
   
   Float_t xyz[3];
-  Int_t sector,padrow;
+  Int_t padrow;
   for(Int_t i=0; i<num_of_clusters; i++)
     {
       id = hitnum[i];
@@ -652,29 +629,36 @@ Int_t **AliL3Evaluate::GetClusterIDs(AliL3Track *track,UInt_t *index,Int_t *pID,
       //sector = points[pos].fSector;
       padrow = points[pos].fPadRow;
       Int_t se,ro;
-      fTransform->Slice2Sector(slice,padrow,se,ro);
-      fTransform->Global2Raw(xyz,se,ro);
+      AliL3Transform::Slice2Sector(slice,padrow,se,ro);
+      AliL3Transform::Global2Raw(xyz,se,ro);
       
       if(fIsSlow)
        {
          Int_t p = fRowid[slice][padrow];
-         
          if(!fDigitsTree->GetEvent(p)) 
            LOG(AliL3Log::kError,"AliL3Evaluate::GetClusterIDs","Digits Tree")
              <<"Error reading digits tree"<<ENDLOG;
          
          trackID[i] = new Int_t[3];
-         trackID[i][0] = fDigits->GetTrackID((Int_t)xyz[2],(Int_t)xyz[1],0);
-         trackID[i][1] = fDigits->GetTrackID((Int_t)xyz[2],(Int_t)xyz[1],1);
-         trackID[i][2] = fDigits->GetTrackID((Int_t)xyz[2],(Int_t)xyz[1],2);
+         trackID[i][0] = fDigits->GetTrackID((Int_t)rint(xyz[2]),(Int_t)rint(xyz[1]),0);
+         trackID[i][1] = fDigits->GetTrackID((Int_t)rint(xyz[2]),(Int_t)rint(xyz[1]),1);
+         trackID[i][2] = fDigits->GetTrackID((Int_t)rint(xyz[2]),(Int_t)rint(xyz[1]),2);
+         //if(trackID[i][0]==6 || trackID[i][0]==32)
+         //printf("trackID %d, padrow %d pad %d time %d\n",fDigits->GetTrackID((Int_t)rint(xyz[2]),(Int_t)rint(xyz[1]),0),padrow,(int)rint(xyz[1]),(int)rint(xyz[2]));
+         /*if(trackID[i][0]<0)
+           {
+             
+           printf("trackID %d, padrow %d pad %d time %d\n",trackID[i][0],padrow,(int)rint(xyz[1]),(int)rint(xyz[2]));
+           printf("on the side %d %d %d %d\n",fDigits->GetTrackID(((int)rint(xyz[2])-1),((int)rint(xyz[1])),0),fDigits->GetTrackID(((int)rint(xyz[2])+1),((int)rint(xyz[1])),0),fDigits->GetTrackID(((int)rint(xyz[2])),((int)rint(xyz[1])-1),0),fDigits->GetTrackID(((int)rint(xyz[2])),((int)rint(xyz[1])+1),0));
+           }*/
        }
       else
        {
          Int_t tmp_pid=0;
-         for(Int_t ii=0; ii<npoints; ii++)
+         for(Int_t ii=0; ii<fNFastPoints; ii++)
            {
-             tmp_pid = pID[ii];
-             if(index[ii] == id) break;
+             tmp_pid = fMcId[ii];
+             if(fMcIndex[ii] == id) break;
            }
          trackID[i] = new Int_t[3];
          trackID[i][0] = tmp_pid;
@@ -682,35 +666,167 @@ Int_t **AliL3Evaluate::GetClusterIDs(AliL3Track *track,UInt_t *index,Int_t *pID,
          trackID[i][2] = -1;
        }
     }
+
   return trackID;
 }
 
-Int_t *AliL3Evaluate::GetFastIDs(UInt_t &tmp_ind,Int_t &npoints)
+void AliL3Evaluate::GetFastClusterIDs(Char_t *path)
 {
   //Get the MC id of space points in case of using the fast simulator. 
-
-  FILE *infile = fopen("point_mc.dat","r");
-  if(!infile) return 0;
+  char fname[256];
+  sprintf(fname,"%s/point_mc.dat",path);
+  FILE *infile = fopen(fname,"r");
+  if(!infile) return;
   Int_t hitid,hitmc,i;
   
   for(i=0; ; i++)
     if(fscanf(infile,"%d %d",&hitid,&hitmc)==EOF) break;
-  npoints = i;
   rewind(infile);
-  Int_t *pID = new Int_t[npoints];
-  UInt_t *ind = new UInt_t[npoints];
-  tmp_ind = (UInt_t)ind;
+  fNFastPoints = i;
+  fMcId = new Int_t[fNFastPoints];
+  fMcIndex = new UInt_t[fNFastPoints];
   
-  for(i=0; i<npoints; i++)
+  for(i=0; i<fNFastPoints; i++)
     {
       if(fscanf(infile,"%d %d",&hitid,&hitmc)==EOF) break;
-      pID[i] = hitmc;
-      ind[i] = hitid;
+      fMcId[i] = hitmc;
+      fMcIndex[i] = hitid;
     }
   fclose(infile);
+}
 
-  return pID;
+void AliL3Evaluate::CreateHistos(Int_t nbin,Int_t xlow,Int_t xup)
+{
+  //Create the histograms 
+  
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::CreateHistos","Allocating")
+    <<"Creating histograms..."<<ENDLOG;
+  
+  fNtuppel = new TNtuple("fNtuppel","Pt resolution","pt_gen:pt_found:nHits");
 
+  fPtRes = new TH1F("fPtRes","Relative Pt resolution",30,-10.,10.); 
+  fNGoodTracksPt = new TH1F("fNGoodTracksPt","Good tracks vs pt",nbin,xlow,xup);    
+  fNFoundTracksPt = new TH1F("fNFoundTracksPt","Found tracks vs pt",nbin,xlow,xup);
+  fNFakeTracksPt = new TH1F("fNFakeTracksPt","Fake tracks vs pt",nbin,xlow,xup);
+  fTrackEffPt = new TH1F("fTrackEffPt","Tracking efficiency vs pt",nbin,xlow,xup);
+  fFakeTrackEffPt = new TH1F("fFakeTrackEffPt","Efficiency for fake tracks vs pt",nbin,xlow,xup);
+  
+  fNGoodTracksEta = new TH1F("fNGoodTracksEta","Good tracks vs eta",20,-50,50);
+  fNFoundTracksEta = new TH1F("fNFoundTracksEta","Found tracks vs eta",20,-50,50);
+  fNFakeTracksEta = new TH1F("fNFakeTracksEta","Fake tracks vs eta",20,-50,50);
+  fTrackEffEta = new TH1F("fTrackEffEta","Tracking efficienct vs eta",20,-50,50);
+  fFakeTrackEffEta = new TH1F("fFakeTrackEffEta","Efficiency for fake tracks vs eta",20,-50,50);
+  printf("finished creating histos\n");
+}
+
+/*
+void AliL3Evaluate::FillEffHistos()
+{  
+  //Fill the efficiency histograms.
+  
+  for(Int_t i=0; i<fGoodGen; i++)
+    {
+      Double_t ptg=fGoodTracks[i].pt,pzg=fGoodTracks[i].pz;
+      Float_t dipangle=TMath::ATan2(pzg,ptg)*180./TMath::Pi();
+      //printf("filling particle with pt %f and dipangle %f\n",ptg,dipangle);
+      fNGoodTracksPt->Fill(ptg);
+      fNGoodTracksEta->Fill(dipangle);
+      Int_t found = 0;
+      for(Int_t k=0; k<fTracks->GetNTracks(); k++)
+       {
+         AliL3Track *track = fTracks->GetCheckedTrack(k);
+         if(!track) continue;
+         Int_t nHits = track->GetNumberOfPoints();
+         if(nHits < fMinPointsOnTrack) break;
+         
+         Int_t tracklabel;
+         tracklabel = track->GetMCid();
+         //printf("evaluating track id %d\n",tracklabel);
+         if(TMath::Abs(tracklabel) != fGoodTracks[i].label) continue;
+         found=1;
+         if(tracklabel == fGoodTracks[i].label) {fNFoundTracksPt->Fill(ptg); fNFoundTracksEta->Fill(dipangle);}
+         else {fNFakeTracksPt->Fill(ptg); fNFakeTracksEta->Fill(dipangle);}
+         Float_t pt=track->GetPt();
+         fPtRes->Fill((pt-ptg)/ptg*100.);
+         fNtuppel->Fill(ptg,pt,nHits);
+         break;
+         
+       }
+    }
+}
+*/
+
+void AliL3Evaluate::FillEffHistos()
+{  
+  //Fill the efficiency histograms.
+  
+  cout<<endl<<"Note: Doing NAIVE evaluation "<<endl;
+  for(Int_t i=0; i<fGoodGen; i++)
+    {
+      Double_t ptg=fGoodTracks[i].pt,pzg=fGoodTracks[i].pz;
+      Float_t dipangle=TMath::ATan2(pzg,ptg)*180./TMath::Pi();
+      //printf("filling particle with pt %f and dipangle %f\n",ptg,dipangle);
+      fNGoodTracksPt->Fill(ptg);
+      fNGoodTracksEta->Fill(dipangle);
+      
+    }
+  
+  for(Int_t k=0; k<fTracks->GetNTracks(); k++)
+    {
+      AliL3Track *track = fTracks->GetCheckedTrack(k);
+      if(!track) continue;
+      Int_t nHits = track->GetNumberOfPoints();
+      if(nHits < fMinPointsOnTrack) break;
+      if(track->GetPt()<fMinGoodPt) continue;
+      if(fabs(track->GetPseudoRapidity())>0.9) continue;
+
+      fNFoundTracksPt->Fill(track->GetPt()); fNFoundTracksEta->Fill(track->GetPseudoRapidity());
+      //Float_t pt=track->GetPt();
+      //fPtRes->Fill((pt-ptg)/ptg*100.);
+      //fNtuppel->Fill(ptg,pt,nHits);
+            
+    }
+}
+
+void AliL3Evaluate::CalcEffHistos(){  
+  
+  Stat_t ngood=fNGoodTracksPt->GetEntries();
+  Stat_t nfound=fNFoundTracksPt->GetEntries();
+  Stat_t nfake=fNFakeTracksPt->GetEntries();
+  
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
+    <<AliL3Log::kDec<<"There was "<<ngood<<" generated good tracks"<<ENDLOG;
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
+    <<AliL3Log::kDec<<"Found "<<nfound<<" tracks"<<ENDLOG;
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
+    <<AliL3Log::kDec<<"Integral efficiency is about "<<nfound/ngood*100<<ENDLOG;
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
+    <<AliL3Log::kDec<<"Fake tracks relative is about "<<nfake/ngood*100<<ENDLOG;
+  
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::FillEffHistos","Efficiency")
+    <<AliL3Log::kDec<<"Naive efficiency "<<(Double_t)fGoodFound/(Double_t)fGoodGen<<ENDLOG;
+
+  
+  fNFoundTracksPt->Sumw2(); fNGoodTracksPt->Sumw2();
+  fTrackEffPt->Divide(fNFoundTracksPt,fNGoodTracksPt,1,1.,"b");
+  fFakeTrackEffPt->Divide(fNFakeTracksPt,fNGoodTracksPt,1,1.,"b");
+  fTrackEffPt->SetMaximum(1.4);
+  fTrackEffPt->SetXTitle("P_{T} [GeV]");
+  fTrackEffPt->SetLineWidth(2);
+  fFakeTrackEffPt->SetFillStyle(3013);
+  fTrackEffPt->SetLineColor(4);
+  fFakeTrackEffPt->SetFillColor(2);
+  
+  fNFoundTracksEta->Sumw2(); fNGoodTracksEta->Sumw2();
+  fTrackEffEta->Divide(fNFoundTracksEta,fNGoodTracksEta,1,1.,"b");
+  fFakeTrackEffEta->Divide(fNFakeTracksEta,fNGoodTracksEta,1,1.,"b");
+  fTrackEffEta->SetMaximum(1.4);
+  fTrackEffEta->SetXTitle("#lambda [degrees]");
+  fTrackEffEta->SetLineWidth(2);
+  fFakeTrackEffEta->SetFillStyle(3013);
+  fTrackEffEta->SetLineColor(4);
+  fFakeTrackEffEta->SetFillColor(2);
+       
 }
 
 void AliL3Evaluate::Write2File(Char_t *outputfile)
@@ -726,6 +842,7 @@ void AliL3Evaluate::Write2File(Char_t *outputfile)
     }
   
   of->cd();
+  fNtuppel->Write();
   fPtRes->Write();
   fNGoodTracksPt->Write();
   fNFoundTracksPt->Write();
@@ -743,3 +860,307 @@ void AliL3Evaluate::Write2File(Char_t *outputfile)
 
 }
 
+TNtuple *AliL3Evaluate::CalculateResiduals()
+{
+
+  TNtuple *ntuppel=new TNtuple("ntuppel","Residuals","residual_trans:residual_long:zHit:pt:dipangle:beta:padrow:nHits");
+
+  for(int f=fMinSlice; f<=fMaxSlice; f++)
+    {
+      AliL3FileHandler *tfile = new AliL3FileHandler();
+      char fname[256];
+      sprintf(fname,"tracks_tr_%d_0.raw",f);
+      if(!tfile->SetBinaryInput(fname)){
+       LOG(AliL3Log::kError,"AliL3Evaluation::Setup","File Open")
+         <<"Inputfile "<<fname<<" does not exist"<<ENDLOG; 
+       return 0;
+      }
+      fTracks = new AliL3TrackArray();
+      tfile->Binary2TrackArray(fTracks);
+      tfile->CloseBinaryInput();
+      delete tfile;
+      printf("Looking in slice %d\n",f);
+      for(Int_t i=0; i<fTracks->GetNTracks(); i++)
+       {
+         
+         AliL3Track *track = (AliL3Track*)fTracks->GetCheckedTrack(i);
+         if(!track) continue;
+         
+         track->CalculateHelix();
+         UInt_t *hitnum = track->GetHitNumbers();
+         UInt_t id;
+         
+         Float_t xyz[3];
+         Int_t padrow;
+         for(Int_t j=0; j<track->GetNumberOfPoints()-1; j++)
+           {
+             id = hitnum[j];
+             Int_t slice = (id>>25) & 0x7f;
+             Int_t patch = (id>>22) & 0x7;
+             UInt_t pos = id&0x3fffff;       
+             
+             //if(slice!=1) continue;
+             
+             AliL3SpacePointData *points = fClusters[slice][patch];
+             
+             if(!points) 
+               {
+                 LOG(AliL3Log::kError,"AliL3Evaluate::CalculateResiduals","Clusterarray")
+                   <<"No points at slice "<<slice<<" patch "<<patch<<" pos "<<pos<<ENDLOG;
+                 continue;
+               }
+             if(pos>=fNcl[slice][patch]) 
+               {
+                 LOG(AliL3Log::kError,"AliL3Evaluate::CalculateResiduals","Clusterarray")
+                   <<AliL3Log::kDec<<"ERROR"<<ENDLOG;
+                 continue;
+               }
+             
+             xyz[0] = points[pos].fX;
+             xyz[1] = points[pos].fY;
+             xyz[2] = points[pos].fZ;
+             padrow = points[pos].fPadRow;
+             //AliL3Transform::Global2Local(xyz,slice);
+             
+             Float_t xyz_cross[3];
+             track->GetCrossingPoint(padrow,xyz_cross);
+             Double_t beta = track->GetCrossingAngle(padrow);
+             
+             Double_t yres = xyz_cross[1] - xyz[1];
+             Double_t zres = xyz_cross[2] - xyz[2];
+             
+             Double_t dipangle = atan(track->GetTgl());
+             ntuppel->Fill(yres,zres,xyz_cross[2],track->GetPt(),dipangle,beta,padrow,track->GetNumberOfPoints());
+             
+           }
+       }
+      if(fTracks)
+       delete fTracks;
+    }
+  return ntuppel;
+}
+
+TNtuple *AliL3Evaluate::EvaluatePoints(Char_t *rootfile)
+{
+  //Compare points to the exact crossing points of track and padrows.
+  //The input file to this function, contains the exact clusters calculated
+  //in AliTPC::Hits2ExactClusters.
+    
+  cout<<"Evaluating points"<<endl;
+  TNtuple *ntuppel = new TNtuple("ntuppel","residuals","slice:padrow:resy:resz:zHit:pt");
+  
+  TFile *exfile = TFile::Open(rootfile);
+  if(!exfile)
+    {
+      cerr<<"Error opening rootfile "<<rootfile<<endl;
+      return 0;
+    }
+
+  AliTPCParam *param = (AliTPCParam*)exfile->Get(AliL3Transform::GetParamName());
+  
+  //Get the exact clusters from file:
+  AliTPCClustersArray *arr = new AliTPCClustersArray;
+  arr->Setup(param);
+  arr->SetClusterType("AliComplexCluster");
+  char treeName[500];
+  sprintf(treeName,"TreeCExact_%s",param->GetTitle());
+  Bool_t clusterok = arr->ConnectTree(treeName);//Segment Tree (for offline clusters)
+  if(!clusterok) {printf("AliL3Evaluate::EvaluatePoints : Error in clusterloading\n"); return 0;}
+  
+  cout<<"Entering loop with "<<(Int_t)arr->GetTree()->GetEntries()<<endl;
+  for(Int_t i=0; i<arr->GetTree()->GetEntries(); i++)
+    {
+      //Get the exact clusters for this row:
+      Int_t cursec,currow;
+      AliSegmentID *s = arr->LoadEntry(i);
+      param->AdjustSectorRow(s->GetID(),cursec,currow);
+      
+      AliTPCClustersRow *ro = (AliTPCClustersRow *)arr->GetRow(cursec,currow);
+      TClonesArray *clusters = ro->GetArray();
+      int num_of_offline=clusters->GetEntriesFast();
+      
+      //Get the found clusters:
+      Int_t slice,padrow;
+      AliL3Transform::Sector2Slice(slice,padrow,cursec,currow);
+      if(slice<fMinSlice || slice>fMaxSlice) continue;
+      AliL3SpacePointData *points = fClusters[slice][0];
+      
+      Int_t index = fRowid[slice][padrow];
+      if(!fDigitsTree->GetEvent(index))
+       printf("AliL3Evaluate::EvaluatePoints : ERROR IN DIGITSTREE\n");
+      printf("Checking slice %d padrow %d with %d clusters\n",slice,padrow,num_of_offline);
+      
+      for(UInt_t c=0; c<fNcl[slice][0]; c++)
+       {
+         if(points[c].fPadRow!=padrow) continue;
+         for(Int_t m=0; m<num_of_offline; m++)
+           {
+             AliComplexCluster *cluster = (AliComplexCluster *)clusters->UncheckedAt(m);
+             Int_t mcId = cluster->fTracks[0];
+             //Int_t mcId = cluster->GetLabel(0);
+             if(mcId <0) continue;
+             TParticle *part = gAlice->Particle(mcId);
+             
+             Float_t xyz_cl[3] = {points[c].fX,points[c].fY,points[c].fZ};
+             Float_t xyz_ex[3];
+             AliL3Transform::Global2Raw(xyz_cl,cursec,currow);
+             if(fDigits->GetTrackID((Int_t)rint(xyz_cl[2]),(Int_t)rint(xyz_cl[1]),0)!=mcId &&
+                fDigits->GetTrackID((Int_t)rint(xyz_cl[2]),(Int_t)rint(xyz_cl[1]),1)!=mcId &&
+                fDigits->GetTrackID((Int_t)rint(xyz_cl[2]),(Int_t)rint(xyz_cl[1]),2)!=mcId)
+               continue;
+             AliL3Transform::Raw2Local(xyz_ex,cursec,currow,cluster->fY,cluster->fX);
+             AliL3Transform::Raw2Local(xyz_cl,cursec,currow,xyz_cl[1],xyz_cl[2]);
+             Float_t resy = xyz_cl[1] - xyz_ex[1];//cluster->GetY()
+             Float_t resz = xyz_cl[2] - xyz_ex[2];//cluster->GetZ()
+             
+             ntuppel->Fill(slice,padrow,resy,resz,xyz_ex[2],part->Pt());
+           }
+       }      
+      arr->ClearRow(cursec,currow);
+    }
+
+  return ntuppel;
+}
+
+void AliL3Evaluate::GetCFeff(Char_t *outfile)
+{
+  
+  TNtuple *ntuppel = new TNtuple("ntuppel","Cluster finder efficiency","row:ncrossings:nclusters");
+  
+  AliTPC *TPC = (AliTPC*)gAlice->GetDetector("TPC");
+  
+  TPC->SetParam(fParam);
+  
+  Int_t ver = TPC->IsVersion();
+  LOG(AliL3Log::kInformational,"AliL3Evaluate::GetCFeff","TPC version")
+    <<"TPC version "<<ver<<" found on file"<<ENDLOG;
+  
+  Int_t zero=TPC->GetParam()->GetZeroSup();
+  
+  Int_t np = gAlice->GetNtrack();
+  
+  Int_t crossed,recs;
+  Int_t *count = new Int_t[np]; //np number of particles.
+  Int_t i;
+  Float_t xyz[3];
+  for (i=0; i<np; i++) count[i]=0;
+  for(Int_t sl=fMinSlice; sl<=fMaxSlice; sl++)
+    {
+      for (i=0; i<=175; i++) 
+       {
+         crossed=0;
+         recs=0;
+         Int_t index = fRowid[sl][i];
+         if (!fDigitsTree->GetEvent(index)) continue;
+         Int_t sec,row;
+         fParam->AdjustSectorRow(fDigits->GetID(),sec,row);
+         fDigits->First();
+         do {
+           Int_t it=fDigits->CurrentRow(), ip=fDigits->CurrentColumn();
+           Short_t dig = fDigits->GetDigit(it,ip);
+           
+           if(dig<=fParam->GetZeroSup()) continue;
+           if(it < fParam->GetMaxTBin()-1 && it > 0)
+             if(fDigits->GetDigit(it+1,ip) <= fParam->GetZeroSup()
+                && fDigits->GetDigit(it-1,ip) <= fParam->GetZeroSup())
+               continue;
+           
+           AliL3Transform::Raw2Local(xyz,sec,row,ip,it);
+           if(fParam->GetPadRowRadii(sec,row)<230./250.*fabs(xyz[2]))
+             continue;
+           
+           
+           Int_t idx0=fDigits->GetTrackID(it,ip,0); 
+           Int_t idx1=fDigits->GetTrackID(it,ip,1);
+           Int_t idx2=fDigits->GetTrackID(it,ip,2);
+           
+           if (idx0>=0 && dig>=zero) count[idx0]+=1;
+           if (idx1>=0 && dig>=zero) count[idx1]+=1;
+           if (idx2>=0 && dig>=zero) count[idx2]+=1;
+         } while (fDigits->Next());
+         
+         for (Int_t j=0; j<np; j++) 
+           {
+             if (count[j]>1) //at least two digits at this padrow 
+               {
+                 crossed++;
+                 count[j]=0;
+               }
+           }
+         AliL3SpacePointData *points = fClusters[sl][0];
+         for(UInt_t k=0; k<fNcl[sl][0]; k++)
+           {
+             if(points[k].fPadRow!=i) continue;
+             recs++;
+           }
+         ntuppel->Fill(i,crossed,recs);
+       }
+      
+    }
+  delete[] count;
+  
+  TFile *file = TFile::Open(outfile,"RECREATE");
+  ntuppel->Write();
+  file->Close();
+  
+}
+
+Bool_t AliL3Evaluate::GetParticleCrossingPoint(TParticle *part,Int_t slice,Int_t padrow,Float_t *xyz)
+{
+  //Calcluate the crossing point between a generated particle and given padrow.
+  
+  Double_t kappa = AliL3Transform::GetBField()*0.0029980/part->Pt();
+  
+  Double_t radius = 1/fabs(kappa);
+  if(part->GetPdgCode() > 0) kappa = -kappa;
+  
+  Int_t charg;
+  if(kappa>0)
+    charg=-1;
+  else
+    charg=1;
+  
+  Float_t angl[1] = {part->Phi()};
+  
+  AliL3Transform::Global2LocalAngle(angl,slice);
+  
+  Double_t charge = -1.*kappa;
+  Double_t trackPhi0 = angl[0] + charge*0.5*AliL3Transform::Pi()/fabs(charge);
+  
+  Double_t x0=0;
+  Double_t y0=0;
+  Double_t xc = x0 - radius * cos(trackPhi0);
+  Double_t yc = y0 - radius * sin(trackPhi0);
+  
+  //printf("radius %f xc %f yc %f\n",radius,xc,yc);
+
+  Double_t xHit = AliL3Transform::Row2X(padrow);
+  xyz[0] = xHit;
+  Double_t aa = (xHit - xc)*(xHit - xc);
+  Double_t r2 = radius*radius;
+  if(aa > r2)
+    return false;
+
+  Double_t aa2 = sqrt(r2 - aa);
+  Double_t y1 = yc + aa2;
+  Double_t y2 = yc - aa2;
+  xyz[1] = y1;
+  if(fabs(y2) < fabs(y1)) xyz[1] = y2;
+
+  Double_t tgl = part->Pz()/part->Pt();
+
+  Double_t yHit = xyz[1];
+  Double_t angle1 = atan2((yHit - yc),(xHit - xc));
+  if(angle1 < 0) angle1 += 2.*AliL3Transform::Pi();
+  Double_t angle2 = atan2((0 - yc),(0 - xc));
+  if(angle2 < 0) angle2 += 2.*AliL3Transform::Pi();
+  Double_t diff_angle = angle1 - angle2;
+  diff_angle = fmod(diff_angle,2*AliL3Transform::Pi());
+  if((charg*diff_angle) > 0) diff_angle = diff_angle - charg*2.*AliL3Transform::Pi();
+  Double_t s_tot = fabs(diff_angle)*radius;
+  Double_t zHit = 0 + s_tot*tgl;
+  xyz[2] = zHit;
+
+  return true;
+}
+