]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HLT/hough/AliL3Hough.cxx
Seems to be working properly now.
[u/mrichter/AliRoot.git] / HLT / hough / AliL3Hough.cxx
index 621ba034310ab607e3e2a5ccf84a1a846662a43a..0ecebaa789922e702323960d9e0cfb20fd00bc52 100644 (file)
@@ -3,36 +3,53 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
+#include "AliL3StandardIncludes.h"
+#include <sys/time.h>
 
-#include <string.h>
-
+#include "AliL3Logging.h"
 #include "AliL3HoughMerger.h"
 #include "AliL3HoughIntMerger.h"
 #include "AliL3HoughGlobalMerger.h"
-#include "AliL3Logging.h"
 #include "AliL3Histogram.h"
 #include "AliL3Hough.h"
 #include "AliL3HoughTransformer.h"
+#include "AliL3HoughClusterTransformer.h"
+#include "AliL3HoughTransformerLUT.h"
+#include "AliL3HoughTransformerVhdl.h"
 #include "AliL3HoughMaxFinder.h"
 #ifdef use_aliroot
 #include "AliL3FileHandler.h"
 #else
 #include "AliL3MemHandler.h"
 #endif
+#include "AliL3DataHandler.h"
 #include "AliL3DigitData.h"
 #include "AliL3HoughEval.h"
 #include "AliL3Transform.h"
-#include "AliL3Defs.h"
 #include "AliL3TrackArray.h"
 #include "AliL3HoughTrack.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
 
+/** /class AliL3Hough
+//<pre>
 //_____________________________________________________________
 // AliL3Hough
 //
-// Base class for the Hough transform
+// Interface class for the Hough transform
 //
-
+// Example how to use:
+//
+// AliL3Hough *hough = new AliL3Hough(path,kTRUE,NumberOfEtaSegments);
+// hough->ReadData(slice);
+// hough->Transform();
+// hough->FindTrackCandidates();
+// 
+// AliL3TrackArray *tracks = hough->GetTracks(patch);
+//</pre>
+*/
 
 ClassImp(AliL3Hough)
 
@@ -40,29 +57,49 @@ AliL3Hough::AliL3Hough()
 {
   //Constructor
   
-  fBinary = kFALSE;
-  fNEtaSegments = 0;
+  fBinary        = kFALSE;
   fAddHistograms = kFALSE;
-  fDoIterative = kFALSE; 
-  fWriteDigits=kFALSE;
-  fNPatches=0;
+  fDoIterative   = kFALSE; 
+  fWriteDigits   = kFALSE;
+  fUse8bits      = kFALSE;
+
+  fMemHandler       = 0;
+  fHoughTransformer = 0;
+  fEval             = 0;
+  fPeakFinder       = 0;
+  fTracks           = 0;
+  fMerger           = 0;
+  fInterMerger      = 0;
+  fGlobalMerger     = 0;
+
+  fNEtaSegments     = 0;
+  fNPatches         = 0;
+  fVersion          = 0;
+  fCurrentSlice     = 0;
+
+  SetTransformerParams();
+  SetThreshold();
+  SetNSaveIterations();
 }
 
-
-AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments)
+AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv)
 {
+  //Default ctor.
+
   fBinary = binary;
   strcpy(fPath,path);
-  fNEtaSegments = n_eta_segments;
+  fNEtaSegments  = n_eta_segments;
   fAddHistograms = kFALSE;
-  fDoIterative = kFALSE; 
-  fWriteDigits = kFALSE;
-  Init();
+  fDoIterative   = kFALSE; 
+  fWriteDigits   = kFALSE;
+  fUse8bits      = bit8;
+  fVersion       = tv;
 }
 
-
 AliL3Hough::~AliL3Hough()
 {
+  //dtor
+
   CleanUp();
   if(fMerger)
     delete fMerger;
@@ -86,8 +123,7 @@ void AliL3Hough::CleanUp()
       if(fMemHandler[i]) delete fMemHandler[i];
     }
   
-  /*Shitty compiler doesn't allow this:
-    
+  /*
   if(fTracks) delete [] fTracks;
   if(fEval) delete [] fEval;
   if(fHoughTransformer) delete [] fHoughTransformer;
@@ -95,36 +131,77 @@ void AliL3Hough::CleanUp()
   */
 }
 
-void AliL3Hough::Init()
+void AliL3Hough::Init(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv)
 {
-  fNPatches = NPatches;
-  fHoughTransformer = new AliL3HoughTransformer*[fNPatches];
-#ifdef use_aliroot
-  fMemHandler = new AliL3FileHandler*[fNPatches];
-#else
+  fBinary = binary;
+  strcpy(fPath,path);
+  fNEtaSegments = n_eta_segments;
+  fWriteDigits  = kFALSE;
+  fUse8bits     = bit8;
+  fVersion      = tv;
+
+  Init(); //do the rest
+}
+
+void AliL3Hough::Init(Bool_t doit, Bool_t addhists)
+{
+  fDoIterative   = doit; 
+  fAddHistograms = addhists;
+
+  AliL3Transform::Init(fPath,!fBinary);
+  fNPatches = AliL3Transform::GetNPatches();
+
+  fHoughTransformer = new AliL3HoughBaseTransformer*[fNPatches];
   fMemHandler = new AliL3MemHandler*[fNPatches];
-#endif
   fTracks = new AliL3TrackArray*[fNPatches];
   fEval = new AliL3HoughEval*[fNPatches];
+
   for(Int_t i=0; i<fNPatches; i++)
     {
-      fHoughTransformer[i] = new AliL3HoughTransformer(1,i,fNEtaSegments);
-      fHoughTransformer[i]->CreateHistograms(64,-0.003,0.003,64,-0.26,0.26);
-      fHoughTransformer[i]->SetThreshold(3);
+      switch (fVersion){ //choose Transformer
+      case 1: 
+       fHoughTransformer[i] = new AliL3HoughTransformerLUT(0,i,fNEtaSegments);
+       break;
+      case 2:
+       fHoughTransformer[i] = new AliL3HoughClusterTransformer(0,i,fNEtaSegments);
+       break;
+      case 3:
+       fHoughTransformer[i] = new AliL3HoughTransformerVhdl(0,i,fNEtaSegments,fNSaveIterations);
+       break;
+      default:
+       fHoughTransformer[i] = new AliL3HoughTransformer(0,i,fNEtaSegments);
+      }
+
+      fHoughTransformer[i]->CreateHistograms(fNBinX,fLowPt,fNBinY,-fPhi,fPhi);
+      fHoughTransformer[i]->SetLowerThreshold(fThreshold);
+      LOG(AliL3Log::kInformational,"AliL3Hough::Init","Version")
+       <<"Initializing Hough transformer version "<<fVersion<<ENDLOG;
+      
       fEval[i] = new AliL3HoughEval();
       fTracks[i] = new AliL3TrackArray("AliL3HoughTrack");
+      if(fUse8bits)
+       fMemHandler[i] = new AliL3DataHandler();
+      else
 #ifdef use_aliroot
-      fMemHandler[i] = new AliL3FileHandler();
-      if(!fBinary)
-       fMemHandler[i]->SetAliInput(fPath);
+       {
+         fMemHandler[i] = new AliL3FileHandler();
+         if(!fBinary)
+           {
+             Char_t filename[1024];
+             sprintf(filename,"%s/digitfile.root",fPath);
+             fMemHandler[i]->SetAliInput(filename);
+           }
+       }
 #else
       fMemHandler[i] = new AliL3MemHandler();
 #endif
-      
     }
-  fPeakFinder = new AliL3HoughMaxFinder("KappaPhi");
+
+  fPeakFinder = new AliL3HoughMaxFinder("KappaPhi",1000);
   fMerger = new AliL3HoughMerger(fNPatches);
   fInterMerger = new AliL3HoughIntMerger();
+  fGlobalMerger = 0;
 }
 
 void AliL3Hough::Process(Int_t minslice,Int_t maxslice)
@@ -142,23 +219,27 @@ void AliL3Hough::Process(Int_t minslice,Int_t maxslice)
       Evaluate();
       fGlobalMerger->FillTracks(fTracks[0],i);
     }
-  
-  
 }
 
-void AliL3Hough::ReadData(Int_t slice)
+void AliL3Hough::ReadData(Int_t slice,Int_t eventnr)
 {
   //Read data from files, binary or root.
-
+  
+  fCurrentSlice = slice;
   for(Int_t i=0; i<fNPatches; i++)
     {
       fMemHandler[i]->Free();
       UInt_t ndigits=0;
       AliL3DigitRowData *digits =0;
       Char_t name[256];
+      fMemHandler[i]->Init(slice,i);
       if(fBinary)//take input data from binary files
        {
-         sprintf(name,"%sdigits_%d_%d.raw",fPath,slice,i);
+         if(fUse8bits)
+           sprintf(name,"%sdigits_c8_%d_%d.raw",fPath,slice,i);
+         else
+           sprintf(name,"%sdigits_%d_%d.raw",fPath,slice,i);
+
          fMemHandler[i]->SetBinaryInput(name);
          digits = (AliL3DigitRowData *)fMemHandler[i]->CompBinary2Memory(ndigits);
          fMemHandler[i]->CloseBinaryInput();
@@ -166,36 +247,44 @@ void AliL3Hough::ReadData(Int_t slice)
       else //read data from root file
        {
 #ifdef use_aliroot
-         fMemHandler[i]->Init(slice,i,NRows[i]);
-         digits=(AliL3DigitRowData *)fMemHandler[i]->AliDigits2Memory(ndigits); 
+         digits=(AliL3DigitRowData *)fMemHandler[i]->AliDigits2Memory(ndigits,eventnr);
+         fMemHandler[i]->FreeDigitsTree();
 #else
          cerr<<"You cannot read from rootfile now"<<endl;
 #endif
        }
+
+      //set input data and init transformer
       fHoughTransformer[i]->SetInputData(ndigits,digits);
+      fHoughTransformer[i]->Init(slice,i,fNEtaSegments);
     }
 }
 
-void AliL3Hough::Transform()
+void AliL3Hough::Transform(Int_t row_range)
 {
   //Transform all data given to the transformer within the given slice
   //(after ReadData(slice))
-
+  
+  Double_t initTime,cpuTime;
+  initTime = GetCpuTime();
   for(Int_t i=0; i<fNPatches; i++)
     {
       fHoughTransformer[i]->Reset();//Reset the histograms
-      fHoughTransformer[i]->TransformCircle();
+      if(row_range < 0)
+       fHoughTransformer[i]->TransformCircle();
+      else
+       fHoughTransformer[i]->TransformCircleC(row_range);
     }
+  cpuTime = GetCpuTime() - initTime;
+  LOG(AliL3Log::kInformational,"AliL3Hough::Transform()","Timing")
+    <<"Transform done in average per patch of "<<cpuTime*1000/fNPatches<<" ms"<<ENDLOG;
 }
 
 void AliL3Hough::MergePatches()
 {
   if(fAddHistograms) //Nothing to merge here
     return;
-  AliL3Transform *tr = new AliL3Transform();
-  fMerger->SetTransformer(tr);
   fMerger->MergePatches(kTRUE);
-  delete tr;
 }
 
 void AliL3Hough::MergeInternally()
@@ -212,12 +301,50 @@ void AliL3Hough::ProcessSliceIter()
 {
   //Process current slice (after ReadData(slice)) iteratively.
   
-  for(Int_t i=0; i<fNPatches; i++)
+  if(!fAddHistograms)
     {
-      ProcessPatchIter(i);
-      fMerger->FillTracks(fTracks[i],i); //Copy tracks to merger
+      for(Int_t i=0; i<fNPatches; i++)
+       {
+         ProcessPatchIter(i);
+         fMerger->FillTracks(fTracks[i],i); //Copy tracks to merger
+       }
+    }
+  else
+    {
+      for(Int_t i=0; i<10; i++)
+       {
+         Transform();
+         AddAllHistograms();
+         InitEvaluate();
+         AliL3HoughBaseTransformer *tr = fHoughTransformer[0];
+         for(Int_t j=0; j<fNEtaSegments; j++)
+           {
+             AliL3Histogram *hist = tr->GetHistogram(j);
+             if(hist->GetNEntries()==0) continue;
+             fPeakFinder->Reset();
+             fPeakFinder->SetHistogram(hist);
+             fPeakFinder->FindAbsMaxima();
+             AliL3HoughTrack *track = (AliL3HoughTrack*)fTracks[0]->NextTrack();
+             track->SetTrackParameters(fPeakFinder->GetXPeak(0),fPeakFinder->GetYPeak(0),fPeakFinder->GetWeight(0));
+             track->SetEtaIndex(j);
+             track->SetEta(tr->GetEta(j,fCurrentSlice));
+             for(Int_t k=0; k<fNPatches; k++)
+               {
+                 fEval[i]->SetNumOfPadsToLook(2);
+                 fEval[i]->SetNumOfRowsToMiss(2);
+                 fEval[i]->RemoveFoundTracks();
+                 Int_t nrows=0;
+                 if(!fEval[i]->LookInsideRoad(track,nrows))
+                   {
+                     fTracks[0]->Remove(fTracks[0]->GetNTracks()-1);
+                     fTracks[0]->Compress();
+                   }
+               }
+           }
+         
+       }
+      
     }
-  
 }
 
 void AliL3Hough::ProcessPatchIter(Int_t patch)
@@ -225,14 +352,15 @@ void AliL3Hough::ProcessPatchIter(Int_t patch)
   //Process patch in a iterative way. 
   //transform + peakfinding + evaluation + transform +...
 
-  Int_t num_of_tries = 10;
-  AliL3HoughTransformer *tr = fHoughTransformer[patch];
+  Int_t num_of_tries = 5;
+  AliL3HoughBaseTransformer *tr = fHoughTransformer[patch];
   AliL3TrackArray *tracks = fTracks[patch];
   tracks->Reset();
   AliL3HoughEval *ev = fEval[patch];
   ev->InitTransformer(tr);
-  ev->RemoveFoundTracks();
-  ev->SetNumOfRowsToMiss(2);
+  //ev->RemoveFoundTracks();
+  ev->SetNumOfRowsToMiss(3);
+  ev->SetNumOfPadsToLook(2);
   AliL3Histogram *hist;
   for(Int_t t=0; t<num_of_tries; t++)
     {
@@ -242,29 +370,34 @@ void AliL3Hough::ProcessPatchIter(Int_t patch)
        {
          hist = tr->GetHistogram(i);
          if(hist->GetNEntries()==0) continue;
+         fPeakFinder->Reset();
          fPeakFinder->SetHistogram(hist);
-         Int_t n=1;
-         Int_t x[n],y[n];
-         fPeakFinder->FindAbsMaxima(*x,*y);
+         fPeakFinder->FindAbsMaxima();
+         //fPeakFinder->FindPeak1();
          AliL3HoughTrack *track = (AliL3HoughTrack*)tracks->NextTrack();
-         track->SetTrackParameters(hist->GetBinCenterX(*x),hist->GetBinCenterY(*y),1);
-         if(!ev->LookInsideRoad(track,i))
+         track->SetTrackParameters(fPeakFinder->GetXPeak(0),fPeakFinder->GetYPeak(0),fPeakFinder->GetWeight(0));
+         track->SetEtaIndex(i);
+         track->SetEta(tr->GetEta(i,fCurrentSlice));
+         Int_t nrows=0;
+         if(!ev->LookInsideRoad(track,nrows))
            {   
              tracks->Remove(tracks->GetNTracks()-1);
              tracks->Compress();
            }
        }
     }
+  fTracks[0]->QSort();
   LOG(AliL3Log::kInformational,"AliL3Hough::ProcessPatch","NTracks")
     <<AliL3Log::kDec<<"Found "<<tracks->GetNTracks()<<" tracks in patch "<<patch<<ENDLOG;
 }
 
-
 void AliL3Hough::AddAllHistograms()
 {
   //Add the histograms within one etaslice.
   //Resulting histogram are in patch=0.
 
+  Double_t initTime,cpuTime;
+  initTime = GetCpuTime();
   for(Int_t i=0; i<fNEtaSegments; i++)
     {
       AliL3Histogram *hist0 = fHoughTransformer[0]->GetHistogram(i);
@@ -275,6 +408,9 @@ void AliL3Hough::AddAllHistograms()
        }
     }
   fAddHistograms = kTRUE;
+  cpuTime = GetCpuTime() - initTime;
+  LOG(AliL3Log::kInformational,"AliL3Hough::AddAllHistograms()","Timing")
+    <<"Adding histograms in "<<cpuTime*1000<<" ms"<<ENDLOG;
 }
 
 void AliL3Hough::FindTrackCandidates()
@@ -283,116 +419,229 @@ void AliL3Hough::FindTrackCandidates()
   
   Int_t n_patches;
   if(fAddHistograms)
-    n_patches = 1; //Histograms has been added.
+    n_patches = 1; //Histograms have been added.
   else
     n_patches = fNPatches;
   
+  Double_t initTime,cpuTime;
+  initTime = GetCpuTime();
+
   for(Int_t i=0; i<n_patches; i++)
     {
-      AliL3HoughTransformer *tr = fHoughTransformer[i];
+      AliL3HoughBaseTransformer *tr = fHoughTransformer[i];
       fTracks[i]->Reset();
+      
       for(Int_t j=0; j<fNEtaSegments; j++)
        {
          AliL3Histogram *hist = tr->GetHistogram(j);
          if(hist->GetNEntries()==0) continue;
+         fPeakFinder->Reset();
          fPeakFinder->SetHistogram(hist);
-         Int_t n=10;
-         Float_t x[10];
-         Float_t y[10];
-         Int_t weight[10];
-         fPeakFinder->FindPeak1(x,y,weight,n,1);
-         for(Int_t k=0; k<n; k++)
+         //fPeakFinder->FindPeak1(3,1);
+         fPeakFinder->FindMaxima(0,0); //Simple maxima finder
+         //fPeakFinder->FindAbsMaxima();
+         for(Int_t k=0; k<fPeakFinder->GetEntries(); k++)
            {
-             if(weight[k] == 0) continue;
+             if(fPeakFinder->GetWeight(k) == 0) continue;
              AliL3HoughTrack *track = (AliL3HoughTrack*)fTracks[i]->NextTrack();
-             track->SetTrackParameters(x[k],y[k],weight[k]);
+             track->SetTrackParameters(fPeakFinder->GetXPeak(k),fPeakFinder->GetYPeak(k),fPeakFinder->GetWeight(k));
              track->SetEtaIndex(j);
-             track->SetEta((Double_t)(j*tr->GetEtaSlice()));
-             track->SetRowRange(NRows[0][0],NRows[5][1]);
+             track->SetEta(tr->GetEta(j,fCurrentSlice));
+             track->SetRowRange(AliL3Transform::GetFirstRow(0),AliL3Transform::GetLastRow(5));
            }
        }
       fTracks[i]->QSort();
     }
+  cpuTime = GetCpuTime() - initTime;
+  LOG(AliL3Log::kInformational,"AliL3Hough::FindTrackCandidates()","Timing")
+    <<"Maxima finding done in "<<cpuTime*1000<<" ms"<<ENDLOG;
 }
 
-void AliL3Hough::Evaluate(Int_t road_width)
+void AliL3Hough::InitEvaluate()
 {
-  //Evaluate the tracks, by looking along the road in the raw data.
+  //Pass the transformer objects to the AliL3HoughEval objects:
+  //This will provide the evaluation objects with all the necessary
+  //data and parameters it needs.
   
+  for(Int_t i=0; i<fNPatches; i++) 
+    fEval[i]->InitTransformer(fHoughTransformer[i]);
+}
 
+Int_t AliL3Hough::Evaluate(Int_t road_width,Int_t nrowstomiss)
+{
+  //Evaluate the tracks, by looking along the road in the raw data.
+  //If track does not cross all padrows - rows2miss, it is removed from the arrray.
+  //If histograms were not added, the check is done locally in patch,
+  //meaning that nrowstomiss is the number of padrows the road can miss with respect
+  //to the number of rows in the patch.
+  //If the histograms were added, the comparison is done globally in the _slice_, 
+  //meaing that nrowstomiss is the number of padrows the road can miss with
+  //respect to the total number of padrows in the slice.
+  //
+  //Return value = number of tracks which were removed (only in case of fAddHistograms)
+  
   if(!fTracks[0])
     {
       LOG(AliL3Log::kError,"AliL3Hough::Evaluate","Track Array")
        <<"No tracks to work with..."<<ENDLOG;
-      return;
+      return 0;
+    }
+  
+  Int_t removed_tracks=0;
+  AliL3TrackArray *tracks=0;
+
+  if(fAddHistograms)
+    {
+      tracks = fTracks[0];
+      for(Int_t i=0; i<tracks->GetNTracks(); i++)
+       {
+         AliL3Track *track = tracks->GetCheckedTrack(i);
+         if(!track) continue;
+         track->SetNHits(0);
+       }
     }
   
-  printf("Number of tracks before evaluation %d\n",fTracks[0]->GetNTracks());
-  AliL3TrackArray *tracks;
   for(Int_t i=0; i<fNPatches; i++)
+    EvaluatePatch(i,road_width,nrowstomiss);
+  
+  //Here we check the tracks globally; 
+  //how many good rows (padrows with signal) 
+  //did it cross in the slice
+  if(fAddHistograms) 
+
     {
-      fEval[i]->InitTransformer(fHoughTransformer[i]);
-      fEval[i]->SetNumOfRowsToMiss(2);
-      fEval[i]->SetNumOfPadsToLook(road_width);
-      if(fAddHistograms)
-       tracks = fTracks[0];
-      else
-       tracks = fTracks[i];
       for(Int_t j=0; j<tracks->GetNTracks(); j++)
        {
          AliL3HoughTrack *track = (AliL3HoughTrack*)tracks->GetCheckedTrack(j);
-         if(!track)
+         
+         if(track->GetNHits() < AliL3Transform::GetNRows() - nrowstomiss)
            {
-             LOG(AliL3Log::kWarning,"AliL3Hough::Evaluate","Track array")
-               <<"Track object missing!"<<ENDLOG;
-             continue;
+             tracks->Remove(j);
+             removed_tracks++;
            }
-         
-         if(!fEval[i]->LookInsideRoad(track,track->GetEtaIndex()))
-           tracks->Remove(j);
-         if(fAddHistograms)
-           track->SetRowRange(NRows[0][0],NRows[5][1]);//All rows included
        }
       tracks->Compress();
-      tracks->QSort(); //Sort the tracks according to weight
-      
-      if(!fAddHistograms)
-       fMerger->FillTracks(tracks,i); //Copy tracks to the track merger
+      tracks->QSort();
     }
+    
+  return removed_tracks;
+}
+
+void AliL3Hough::EvaluatePatch(Int_t i,Int_t road_width,Int_t nrowstomiss)
+{
+  //Evaluate patch i.
+  
+  fEval[i]->InitTransformer(fHoughTransformer[i]);
+  fEval[i]->SetNumOfPadsToLook(road_width);
+  fEval[i]->SetNumOfRowsToMiss(nrowstomiss);
+  //fEval[i]->RemoveFoundTracks();
   
+  AliL3TrackArray *tracks=0;
+  
+  if(!fAddHistograms)
+    tracks = fTracks[i];
+  else
+    tracks = fTracks[0];
+  
+  Int_t nrows=0;
+  for(Int_t j=0; j<tracks->GetNTracks(); j++)
+    {
+      AliL3HoughTrack *track = (AliL3HoughTrack*)tracks->GetCheckedTrack(j);
+      if(!track)
+       {
+         LOG(AliL3Log::kWarning,"AliL3Hough::EvaluatePatch","Track array")
+           <<"Track object missing!"<<ENDLOG;
+         continue;
+       } 
+      nrows=0;
+      Bool_t result = fEval[i]->LookInsideRoad(track,nrows);
+      if(fAddHistograms)
+       {
+         Int_t pre=track->GetNHits();
+         track->SetNHits(pre+nrows);
+       }
+      //else//the track crossed too few good padrows (padrows with signal) in the patch, so remove it
+      //{
+      if(result == kFALSE)
+       tracks->Remove(j);
+      //}
+    }
+  
+  tracks->Compress();
+  /*
+    if(!fAddHistograms)
+    {
+    tracks->Compress();
+    tracks->QSort(); 
+    fMerger->FillTracks(tracks,i); //Copy tracks to the track merger
+    }
+  */
+
 }
 
-void AliL3Hough::EvaluateWithEta()
+void AliL3Hough::MergeEtaSlices()
 {
-  if(!fTracks[0])
+  //Merge tracks found in neighbouring eta slices.
+  //Removes the track with the lower weight.
+  
+  AliL3TrackArray *tracks = fTracks[0];
+  if(!tracks)
     {
-      printf("AliL3Hough::EvaluateWithEta: NO TRACKS\n");
+      cerr<<"AliL3Hough::MergeEtaSlices : No tracks "<<endl;
       return;
     }
-  printf("Number of tracks before evaluation %d\n",fTracks[0]->GetNTracks());
-  for(Int_t i=0; i<fNPatches; i++)
+  for(Int_t j=0; j<tracks->GetNTracks(); j++)
     {
-      fEval[i]->InitTransformer(fHoughTransformer[i]);
-      fEval[i]->FindEta(fTracks[0]);
+      AliL3HoughTrack *track1 = (AliL3HoughTrack*)tracks->GetCheckedTrack(j);
+      if(!track1) continue;
+      for(Int_t k=j+1; k<tracks->GetNTracks(); k++)
+       {
+         AliL3HoughTrack *track2 = (AliL3HoughTrack*)tracks->GetCheckedTrack(k);
+         if(!track2) continue;
+         if(abs(track1->GetEtaIndex() - track2->GetEtaIndex()) != 1) continue;
+         if(track1->GetKappa() == track2->GetKappa() && track1->GetPsi() == track2->GetPsi())
+           {
+             cout<<"Merging track in slices "<<track1->GetEtaIndex()<<" "<<track2->GetEtaIndex()<<endl;
+               if(track1->GetWeight() > track2->GetWeight())
+                 tracks->Remove(k);
+               else
+                 tracks->Remove(j);
+           }
+       }
     }
-  fMerger->FillTracks(fTracks[0],0);
+  tracks->Compress();
 }
 
-void AliL3Hough::WriteTracks(Char_t *path)
+void AliL3Hough::WriteTracks(Int_t slice,Char_t *path)
 {
+  //Write the tracks in slice
+  
   AliL3MemHandler *mem = new AliL3MemHandler();
   Char_t fname[100];
-  sprintf(fname,"%s/tracks.raw",path);
-  mem->SetBinaryOutput(fname);
-  mem->TrackArray2Binary(fTracks[0]);
-  mem->CloseBinaryOutput();
+  if(fAddHistograms)
+    {
+      sprintf(fname,"%s/tracks_ho_%d.raw",path,slice);
+      mem->SetBinaryOutput(fname);
+      mem->TrackArray2Binary(fTracks[0]);
+      mem->CloseBinaryOutput();
+    }
+  else 
+    {
+      for(Int_t i=0; i<fNPatches; i++)
+       {
+         sprintf(fname,"%s/tracks_ho_%d_%d.raw",path,slice,i);
+         mem->SetBinaryOutput(fname);
+         mem->TrackArray2Binary(fTracks[i]);
+         mem->CloseBinaryOutput();
+       }
+    }
   delete mem;
   
 }
-#ifdef use_aliroot
+
 void AliL3Hough::WriteDigits(Char_t *outfile)
 {
+#ifdef use_aliroot  
   //Write the current data to a new rootfile.
 
   for(Int_t i=0; i<fNPatches; i++)
@@ -400,6 +649,18 @@ void AliL3Hough::WriteDigits(Char_t *outfile)
       AliL3DigitRowData *tempPt = (AliL3DigitRowData*)fHoughTransformer[i]->GetDataPointer();
       fMemHandler[i]->AliDigits2RootFile(tempPt,outfile);
     }
-  
+#else
+  cerr<<"AliL3Hough::WriteDigits : You need to compile with AliROOT!"<<endl;
+  return;
+#endif  
 }
-#endif
+
+Double_t AliL3Hough::GetCpuTime()
+{
+  //Return the Cputime in seconds.
+ struct timeval tv;
+ gettimeofday( &tv, NULL );
+ return tv.tv_sec+(((Double_t)tv.tv_usec)/1000000.);
+ //return (Double_t)(clock()) / CLOCKS_PER_SEC;
+}
+