]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HLT/hough/AliL3Hough.cxx
Added support for NEWIO, merged cern-hlt tree, updated to latest track candidate...
[u/mrichter/AliRoot.git] / HLT / hough / AliL3Hough.cxx
index 233e16038d7ddd2f89531251090eb833db7bd53d..194e8fefc3fb21886ea0b4b742a6c880bfa3ff1f 100644 (file)
@@ -1,7 +1,7 @@
-//$Id$
+// @(#) $Id$
 
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
-//*-- Copyright &copy ASV 
+//*-- Copyright &copy ALICE HLT Group
 
 #include "AliL3StandardIncludes.h"
 #include <sys/time.h>
@@ -17,6 +17,7 @@
 #include "AliL3HoughTransformerLUT.h"
 #include "AliL3HoughTransformerVhdl.h"
 #include "AliL3HoughMaxFinder.h"
+#include "AliL3Benchmark.h"
 #ifdef use_aliroot
 #include "AliL3FileHandler.h"
 #else
@@ -28,6 +29,7 @@
 #include "AliL3Transform.h"
 #include "AliL3TrackArray.h"
 #include "AliL3HoughTrack.h"
+#include "AliL3DDLDataFileHandler.h"
 
 #if GCCVERSION == 3
 using namespace std;
@@ -68,21 +70,25 @@ AliL3Hough::AliL3Hough()
   fEval             = 0;
   fPeakFinder       = 0;
   fTracks           = 0;
+  fGlobalTracks     = 0;
   fMerger           = 0;
   fInterMerger      = 0;
   fGlobalMerger     = 0;
-
+  fBenchmark        = 0;
+  
   fNEtaSegments     = 0;
   fNPatches         = 0;
   fVersion          = 0;
   fCurrentSlice     = 0;
+  fEvent            = 0;
 
   SetTransformerParams();
   SetThreshold();
   SetNSaveIterations();
+  SetPeakThreshold();
 }
 
-AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv)
+AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv,Char_t *infile)
 {
   //Default ctor.
 
@@ -94,6 +100,10 @@ AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bi
   fWriteDigits   = kFALSE;
   fUse8bits      = bit8;
   fVersion       = tv;
+  if(!fBinary)
+    fInputFile = infile;
+  else
+    fInputFile = 0;
 }
 
 AliL3Hough::~AliL3Hough()
@@ -109,6 +119,10 @@ AliL3Hough::~AliL3Hough()
     delete fPeakFinder;
   if(fGlobalMerger)
     delete fGlobalMerger;
+  if(fBenchmark)
+    delete fBenchmark;
+  if(fGlobalTracks)
+    delete fGlobalTracks;
 }
 
 void AliL3Hough::CleanUp()
@@ -123,15 +137,14 @@ void AliL3Hough::CleanUp()
       if(fMemHandler[i]) delete fMemHandler[i];
     }
   
-  /*
-  if(fTracks) delete [] fTracks;
-  if(fEval) delete [] fEval;
-  if(fHoughTransformer) delete [] fHoughTransformer;
-  if(fMemHandler) delete [] fMemHandler;
-  */
+  if(fTracks) delete [] fTracks;
+  if(fEval) delete [] fEval;
+  if(fHoughTransformer) delete [] fHoughTransformer;
+  if(fMemHandler) delete [] fMemHandler;
+  
 }
 
-void AliL3Hough::Init(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv)
+void AliL3Hough::Init(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv,Char_t *infile)
 {
   fBinary = binary;
   strcpy(fPath,path);
@@ -139,6 +152,10 @@ void AliL3Hough::Init(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit
   fWriteDigits  = kFALSE;
   fUse8bits     = bit8;
   fVersion      = tv;
+  if(!fBinary)
+    fInputFile = infile;
+  else
+    fInputFile = 0;
 
   Init(); //do the rest
 }
@@ -148,14 +165,16 @@ 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];
+
   fTracks = new AliL3TrackArray*[fNPatches];
   fEval = new AliL3HoughEval*[fNPatches];
-
+  
+  fGlobalTracks = new AliL3TrackArray("AliL3HoughTrack");
+  
   for(Int_t i=0; i<fNPatches; i++)
     {
       switch (fVersion){ //choose Transformer
@@ -169,12 +188,14 @@ void AliL3Hough::Init(Bool_t doit, Bool_t addhists)
        fHoughTransformer[i] = new AliL3HoughTransformerVhdl(0,i,fNEtaSegments,fNSaveIterations);
        break;
       default:
-       fHoughTransformer[i] = new AliL3HoughTransformer(0,i,fNEtaSegments);
+       fHoughTransformer[i] = new AliL3HoughTransformer(0,i,fNEtaSegments,kFALSE,kFALSE);
       }
 
-      fHoughTransformer[i]->CreateHistograms(fNBinX,fLowPt,fNBinY,-fPhi,fPhi);
-      fHoughTransformer[i]->SetLowerThreshold(fThreshold);
+      fHoughTransformer[i]->CreateHistograms(fNBinX[i],fLowPt[i],fNBinY[i],-fPhi[i],fPhi[i]);
+      //fHoughTransformer[i]->CreateHistograms(fLowPt[i],fUpperPt[i],fPtRes[i],fNBinY[i],fPhi[i]);
+      fHoughTransformer[i]->SetLowerThreshold(fThreshold[i]);
+      fHoughTransformer[i]->SetUpperThreshold(100);
+
       LOG(AliL3Log::kInformational,"AliL3Hough::Init","Version")
        <<"Initializing Hough transformer version "<<fVersion<<ENDLOG;
       
@@ -185,13 +206,20 @@ void AliL3Hough::Init(Bool_t doit, Bool_t addhists)
       else
 #ifdef use_aliroot
        {
-         fMemHandler[i] = new AliL3FileHandler();
-         if(!fBinary)
-           {
-             Char_t filename[100];
+         if(!fInputFile) {
+           /* In case of reading digits file */
+           fMemHandler[i] = new AliL3FileHandler();
+           if(!fBinary) {
+             Char_t filename[1024];
              sprintf(filename,"%s/digitfile.root",fPath);
-             fMemHandler[i]->SetAliInput(filename);
+              fMemHandler[i]->SetAliInput(filename);
            }
+         }
+         else {
+           /* In case of reading rawdata from ROOT file */
+           fMemHandler[i] = new AliL3DDLDataFileHandler();
+           fMemHandler[i]->SetReaderInput(fInputFile);
+         }
        }
 #else
       fMemHandler[i] = new AliL3MemHandler();
@@ -202,6 +230,109 @@ void AliL3Hough::Init(Bool_t doit, Bool_t addhists)
   fMerger = new AliL3HoughMerger(fNPatches);
   fInterMerger = new AliL3HoughIntMerger();
   fGlobalMerger = 0;
+  fBenchmark = new AliL3Benchmark();
+}
+
+void AliL3Hough::SetTransformerParams(Float_t ptres,Float_t ptmin,Float_t ptmax,Int_t ny,Int_t patch)
+{
+
+  Int_t mrow;
+  Float_t psi=0;
+  if(patch==-1)
+    mrow = 80;
+  else
+    mrow = AliL3Transform::GetLastRow(patch);
+  if(ptmin)
+    {
+      Double_t lineradius = sqrt(pow(AliL3Transform::Row2X(mrow),2) + pow(AliL3Transform::GetMaxY(mrow),2));
+      Double_t kappa = -1*AliL3Transform::GetBField()*AliL3Transform::GetBFact()/ptmin;
+      psi = AliL3Transform::Deg2Rad(10) - asin(lineradius*kappa/2);
+      cout<<"Calculated psi range "<<psi<<" in patch "<<patch<<endl;
+    }
+
+  if(patch==-1)
+    {
+      Int_t i=0;
+      while(i < 6)
+       {
+         fPtRes[i] = ptres;
+         fLowPt[i] = ptmin;
+         fUpperPt[i] = ptmax;
+         fNBinY[i] = ny;
+         fPhi[i] = psi;
+         fNBinX[i]=0;
+         i++;
+       }
+      return;
+    }
+
+  fPtRes[patch] = ptres;
+  fLowPt[patch] = ptmin;
+  fUpperPt[patch] = ptmax;
+  fNBinY[patch] = ny;
+  fPhi[patch] = psi;
+}
+
+void AliL3Hough::SetTransformerParams(Int_t nx,Int_t ny,Float_t ptmin,Int_t patch)
+{
+
+  Int_t mrow=80;
+  Double_t lineradius = sqrt(pow(AliL3Transform::Row2X(mrow),2) + pow(AliL3Transform::GetMaxY(mrow),2));
+  Double_t kappa = -1*AliL3Transform::GetBField()*AliL3Transform::GetBFact()/ptmin;
+  Double_t psi = AliL3Transform::Deg2Rad(10) - asin(lineradius*kappa/2);
+  cout<<"Calculated psi range "<<psi<<" in patch "<<patch<<endl;
+  
+  Int_t i=0;
+  while(i < 6)
+    {
+      fLowPt[i] = ptmin;
+      fNBinY[i] = ny;
+      fNBinX[i] = nx;
+      fPhi[i] = psi;
+      i++;
+    }
+}
+
+void AliL3Hough::SetTransformerParams(Int_t nx,Int_t ny,Float_t lpt,Float_t phi)
+{
+  Int_t i=0;
+  while(i < 6)
+    {
+      fLowPt[i] = lpt;
+      fNBinY[i] = ny;
+      fNBinX[i] = nx;
+      fPhi[i] = phi;
+      i++;
+    }
+}
+
+void AliL3Hough::SetThreshold(Int_t t3,Int_t patch)
+{
+  if(patch==-1)
+    {
+      Int_t i=0;
+      while(i < 6)
+       fThreshold[i++]=t3;
+      return;
+    }
+  fThreshold[patch]=t3;
+}
+
+void AliL3Hough::SetPeakThreshold(Int_t threshold,Int_t patch)
+{
+  if(patch==-1)
+    {
+      Int_t i=0;
+      while(i < 6)
+       fPeakThreshold[i++]=threshold;
+      return;
+    }
+  fPeakThreshold[patch]=threshold;
+}
+
+void AliL3Hough::DoBench(Char_t *name)
+{
+  fBenchmark->Analyze(name);
 }
 
 void AliL3Hough::Process(Int_t minslice,Int_t maxslice)
@@ -216,8 +347,8 @@ void AliL3Hough::Process(Int_t minslice,Int_t maxslice)
       if(fAddHistograms)
        AddAllHistograms();
       FindTrackCandidates();
-      Evaluate();
-      fGlobalMerger->FillTracks(fTracks[0],i);
+      //Evaluate();
+      //fGlobalMerger->FillTracks(fTracks[0],i);
     }
 }
 
@@ -225,6 +356,7 @@ void AliL3Hough::ReadData(Int_t slice,Int_t eventnr)
 {
   //Read data from files, binary or root.
   
+  fEvent=eventnr;
   fCurrentSlice = slice;
   for(Int_t i=0; i<fNPatches; i++)
     {
@@ -236,9 +368,9 @@ void AliL3Hough::ReadData(Int_t slice,Int_t eventnr)
       if(fBinary)//take input data from binary files
        {
          if(fUse8bits)
-           sprintf(name,"%sdigits_c8_%d_%d.raw",fPath,slice,i);
+           sprintf(name,"%s/binaries/digits_c8_%d_%d_%d.raw",fPath,eventnr,slice,i);
          else
-           sprintf(name,"%sdigits_%d_%d.raw",fPath,slice,i);
+           sprintf(name,"%s/binaries/digits_%d_%d_%d.raw",fPath,eventnr,slice,i);
 
          fMemHandler[i]->SetBinaryInput(name);
          digits = (AliL3DigitRowData *)fMemHandler[i]->CompBinary2Memory(ndigits);
@@ -247,8 +379,7 @@ void AliL3Hough::ReadData(Int_t slice,Int_t eventnr)
       else //read data from root file
        {
 #ifdef use_aliroot
-         digits=(AliL3DigitRowData *)fMemHandler[i]->AliDigits2Memory(ndigits,eventnr);
-         fMemHandler[i]->FreeDigitsTree();
+         digits=(AliL3DigitRowData *)fMemHandler[i]->AliAltroDigits2Memory(ndigits,eventnr);
 #else
          cerr<<"You cannot read from rootfile now"<<endl;
 #endif
@@ -260,7 +391,7 @@ void AliL3Hough::ReadData(Int_t slice,Int_t eventnr)
     }
 }
 
-void AliL3Hough::Transform(Int_t row_range)
+void AliL3Hough::Transform(Int_t *row_range)
 {
   //Transform all data given to the transformer within the given slice
   //(after ReadData(slice))
@@ -270,10 +401,12 @@ void AliL3Hough::Transform(Int_t row_range)
   for(Int_t i=0; i<fNPatches; i++)
     {
       fHoughTransformer[i]->Reset();//Reset the histograms
-      if(row_range < 0)
+      fBenchmark->Start("Hough Transform");
+      if(!row_range)
        fHoughTransformer[i]->TransformCircle();
       else
-       fHoughTransformer[i]->TransformCircleC(row_range);
+       fHoughTransformer[i]->TransformCircleC(row_range,1);
+      fBenchmark->Stop("Hough Transform");
     }
   cpuTime = GetCpuTime() - initTime;
   LOG(AliL3Log::kInformational,"AliL3Hough::Transform()","Timing")
@@ -333,12 +466,14 @@ void AliL3Hough::ProcessSliceIter()
                  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();
                    }
+                 */
                }
            }
          
@@ -378,12 +513,14 @@ void AliL3Hough::ProcessPatchIter(Int_t patch)
          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();
@@ -398,6 +535,7 @@ void AliL3Hough::AddAllHistograms()
 
   Double_t initTime,cpuTime;
   initTime = GetCpuTime();
+  fBenchmark->Start("Add Histograms");
   for(Int_t i=0; i<fNEtaSegments; i++)
     {
       AliL3Histogram *hist0 = fHoughTransformer[0]->GetHistogram(i);
@@ -407,12 +545,33 @@ void AliL3Hough::AddAllHistograms()
          hist0->Add(hist);
        }
     }
+  fBenchmark->Stop("Add Histograms");
   fAddHistograms = kTRUE;
   cpuTime = GetCpuTime() - initTime;
   LOG(AliL3Log::kInformational,"AliL3Hough::AddAllHistograms()","Timing")
     <<"Adding histograms in "<<cpuTime*1000<<" ms"<<ENDLOG;
 }
 
+void AliL3Hough::AddTracks()
+{
+  if(!fTracks[0])
+    {
+      cerr<<"AliL3Hough::AddTracks : No tracks"<<endl;
+      return;
+    }
+  AliL3TrackArray *tracks = fTracks[0];
+  for(Int_t i=0; i<tracks->GetNTracks(); i++)
+    {
+      AliL3Track *track = tracks->GetCheckedTrack(i);
+      if(!track) continue;
+      if(track->GetNHits()!=1) cerr<<"NHITS "<<track->GetNHits()<<endl;
+      UInt_t *ids = track->GetHitNumbers();
+      ids[0] = (fCurrentSlice&0x7f)<<25;
+    }
+  
+  fGlobalTracks->AddTracks(fTracks[0],0,fCurrentSlice);
+}
+
 void AliL3Hough::FindTrackCandidates()
 {
   //Look for peaks in histograms, and find the track candidates
@@ -425,7 +584,7 @@ void AliL3Hough::FindTrackCandidates()
   
   Double_t initTime,cpuTime;
   initTime = GetCpuTime();
-
+  fBenchmark->Start("Find Maxima");
   for(Int_t i=0; i<n_patches; i++)
     {
       AliL3HoughBaseTransformer *tr = fHoughTransformer[i];
@@ -437,12 +596,14 @@ void AliL3Hough::FindTrackCandidates()
          if(hist->GetNEntries()==0) continue;
          fPeakFinder->Reset();
          fPeakFinder->SetHistogram(hist);
-         //fPeakFinder->FindPeak1(3,1);
-         fPeakFinder->FindMaxima(0,0); //Simple maxima finder
+         
          //fPeakFinder->FindAbsMaxima();
+         fPeakFinder->SetThreshold(fPeakThreshold[i]);
+         fPeakFinder->FindAdaptedPeaks(6);
+         //fPeakFinder->FindMaxima(fPeakThreshold[i]); //Simple maxima finder
+         
          for(Int_t k=0; k<fPeakFinder->GetEntries(); k++)
            {
-             if(fPeakFinder->GetWeight(k) == 0) continue;
              AliL3HoughTrack *track = (AliL3HoughTrack*)fTracks[i]->NextTrack();
              track->SetTrackParameters(fPeakFinder->GetXPeak(k),fPeakFinder->GetYPeak(k),fPeakFinder->GetWeight(k));
              track->SetEtaIndex(j);
@@ -450,8 +611,10 @@ void AliL3Hough::FindTrackCandidates()
              track->SetRowRange(AliL3Transform::GetFirstRow(0),AliL3Transform::GetLastRow(5));
            }
        }
+      cout<<"Found "<<fTracks[i]->GetNTracks()<<" tracks in patch "<<i<<endl;
       fTracks[i]->QSort();
     }
+  fBenchmark->Stop("Find Maxima");
   cpuTime = GetCpuTime() - initTime;
   LOG(AliL3Log::kInformational,"AliL3Hough::FindTrackCandidates()","Timing")
     <<"Maxima finding done in "<<cpuTime*1000<<" ms"<<ENDLOG;
@@ -508,7 +671,6 @@ Int_t AliL3Hough::Evaluate(Int_t road_width,Int_t nrowstomiss)
   //how many good rows (padrows with signal) 
   //did it cross in the slice
   if(fAddHistograms) 
-
     {
       for(Int_t j=0; j<tracks->GetNTracks(); j++)
        {
@@ -554,73 +716,96 @@ void AliL3Hough::EvaluatePatch(Int_t i,Int_t road_width,Int_t nrowstomiss)
          continue;
        } 
       nrows=0;
-      Bool_t result = fEval[i]->LookInsideRoad(track,nrows);
+      Int_t rowrange[2] = {AliL3Transform::GetFirstRow(i),AliL3Transform::GetLastRow(i)};
+      Bool_t result = fEval[i]->LookInsideRoad(track,nrows,rowrange);
       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);
-      //}
+      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.
+  
+  fBenchmark->Start("Merge Eta-slices");
+  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(fabs(track1->GetKappa()-track2->GetKappa()) < 0.006 && 
+            fabs(track1->GetPsi()- track2->GetPsi()) < 0.1)
+           {
+             //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);
+  fBenchmark->Stop("Merge Eta-slices");
+  tracks->Compress();
+}
+
+void AliL3Hough::WriteTracks(Char_t *path)
+{
+  //cout<<"AliL3Hough::WriteTracks : Sorting the tracsk"<<endl;
+  //fGlobalTracks->QSort();
+  
+  Char_t filename[1024];
+  sprintf(filename,"%s/tracks_%d.raw",path,fEvent);
+  AliL3MemHandler mem;
+  mem.SetBinaryOutput(filename);
+  mem.TrackArray2Binary(fGlobalTracks);
+  mem.CloseBinaryOutput();
+  fGlobalTracks->Reset();
 }
 
 void AliL3Hough::WriteTracks(Int_t slice,Char_t *path)
 {
-  //Write the tracks in slice
   
-  AliL3MemHandler *mem = new AliL3MemHandler();
+  AliL3MemHandler mem;
   Char_t fname[100];
   if(fAddHistograms)
     {
-      sprintf(fname,"%s/tracks_ho_%d.raw",path,slice);
-      mem->SetBinaryOutput(fname);
-      mem->TrackArray2Binary(fTracks[0]);
-      mem->CloseBinaryOutput();
+      sprintf(fname,"%s/tracks_ho_%d_%d.raw",path,fEvent,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();
+         sprintf(fname,"%s/tracks_ho_%d_%d_%d.raw",path,fEvent,slice,i);
+         mem.SetBinaryOutput(fname);
+         mem.TrackArray2Binary(fTracks[i]);
+         mem.CloseBinaryOutput();
        }
     }
-  delete mem;
-  
 }
 
 void AliL3Hough::WriteDigits(Char_t *outfile)
@@ -645,6 +830,5 @@ Double_t AliL3Hough::GetCpuTime()
  struct timeval tv;
  gettimeofday( &tv, NULL );
  return tv.tv_sec+(((Double_t)tv.tv_usec)/1000000.);
- //return (Double_t)(clock()) / CLOCKS_PER_SEC;
 }