Some additional changes related to the previous changes. AliL3Transform

object has now to be passed to the AliL3HoughBaseTransformer in order to
avoid giving the path where the config file is to the AliL3HoughBaseTransformer
object.

diff --git a/HLT/hough/AliL3Histogram.cxx b/HLT/hough/AliL3Histogram.cxx
index 6f998ce249bf96571a629f88983a6dd8996fb90f..2b182d14f0f096d880f0bcf835664009c7860094 100644 (file)
--- a/HLT/hough/AliL3Histogram.cxx
+++ b/HLT/hough/AliL3Histogram.cxx
@@ -241,9 +241,10 @@ Double_t AliL3Histogram::GetBinCenterY(Int_t ybin)
   
 }
 
   
 }
 

-#ifdef use_root
+

 void AliL3Histogram::Draw(Char_t *option)
 {
 void AliL3Histogram::Draw(Char_t *option)
 {

+#ifdef use_root

   fRootHisto = new TH2F(fName,"",fNxbins,fXmin,fXmax,fNybins,fYmin,fYmax);
   for(Int_t bin=0; bin<fNcells; bin++)
     {
   fRootHisto = new TH2F(fName,"",fNxbins,fXmin,fXmax,fNybins,fYmin,fYmax);
   for(Int_t bin=0; bin<fNcells; bin++)
     {


@@ -251,6 +252,9 @@ void AliL3Histogram::Draw(Char_t *option)
     }
   
   fRootHisto->Draw(option);
     }
   
   fRootHisto->Draw(option);

+  return;
+#endif
+  cerr<<"AliL3Histogram::Draw : You need to compile with ROOT in order to draw histogram"<<endl;

   
 }
   
 }

-#endif
+

diff --git a/HLT/hough/AliL3Histogram.h b/HLT/hough/AliL3Histogram.h
index e50162147929a0eb40960d9121707d9ca0a86f90..399ffbd50f6b0019030f1e9b44c1bc454bb2c0cb 100644 (file)
--- a/HLT/hough/AliL3Histogram.h
+++ b/HLT/hough/AliL3Histogram.h
@@ -1,7 +1,9 @@
 #ifndef ALIL3_HISTOGRAM
 #define ALIL3_HISTOGRAM
 
 #ifndef ALIL3_HISTOGRAM
 #define ALIL3_HISTOGRAM
 

+#include <stream.h>

 #include "AliL3RootTypes.h"
 #include "AliL3RootTypes.h"

+

 #ifdef use_root
 #include <TH2.h>
 #endif
 #ifdef use_root
 #include <TH2.h>
 #endif


@@ -49,10 +51,12 @@ class AliL3Histogram {
   void AddBinContent(Int_t bin,Int_t weight);
   void Add(AliL3Histogram *h1,Double_t weight=1);
   void SetThreshold(Int_t i) {fThreshold = i;}
   void AddBinContent(Int_t bin,Int_t weight);
   void Add(AliL3Histogram *h1,Double_t weight=1);
   void SetThreshold(Int_t i) {fThreshold = i;}

+  void Draw(Char_t *option="hist");

 
 #ifdef use_root
 
 #ifdef use_root

-  void Draw(Char_t *option="hist");
-  TH2F *GetRootHisto() {return fRootHisto;}
+  TH2F *GetRootHisto();
+#else
+  void *GetRootHisto();

 #endif
     
   Double_t GetXmin() {return fXmin;}
 #endif
     
   Double_t GetXmin() {return fXmin;}


@@ -74,4 +78,23 @@ class AliL3Histogram {
     
 };
 
     
 };
 

+#ifdef use_root
+inline TH2F *AliL3Histogram::GetRootHisto()
+{
+  if(!fRootHisto)
+    {
+      cerr<<"AliL3Histogram::GetRootHisto() : You must first Draw histogram before accessing it"<<endl;
+      return 0;
+    }
+  else
+    return fRootHisto;
+}
+#else
+inline void *AliL3Histogram::GetRootHisto()
+{
+  cerr<<"AliL3Histogram::GetRootHisto() : You must compile with ROOT in order to interface the ROOT histogram"<<endl;
+  return 0;
+}
+#endif
+

 #endif
 #endif

diff --git a/HLT/hough/AliL3Hough.cxx b/HLT/hough/AliL3Hough.cxx
index 0f419bdf0610166e765a7fc7ca9a106a3d386db4..0e8b6510df2afad188026eb7da4d964fb827b1cc 100644 (file)
--- a/HLT/hough/AliL3Hough.cxx
+++ b/HLT/hough/AliL3Hough.cxx
@@ -30,9 +30,16 @@
 //_____________________________________________________________
 // AliL3Hough
 //
 //_____________________________________________________________
 // 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);

 
 ClassImp(AliL3Hough)
 
 
 ClassImp(AliL3Hough)
 


@@ -46,11 +53,22 @@ AliL3Hough::AliL3Hough()
   fDoIterative = kFALSE; 
   fWriteDigits=kFALSE;
   fNPatches=0;
   fDoIterative = kFALSE; 
   fWriteDigits=kFALSE;
   fNPatches=0;

+  fMemHandler = 0;
+  fHoughTransformer = 0;
+  fEval = 0;
+  fPeakFinder = 0;
+  fTracks = 0;
+  fMerger = 0;
+  fInterMerger = 0;
+  fGlobalMerger = 0;
+  fTransform = 0;

 }
 
 
 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)
 {

+  //Default ctor.
+

   fBinary = binary;
   strcpy(fPath,path);
   fNEtaSegments = n_eta_segments;
   fBinary = binary;
   strcpy(fPath,path);
   fNEtaSegments = n_eta_segments;


@@ -63,6 +81,8 @@ AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments)
 
 AliL3Hough::~AliL3Hough()
 {
 
 AliL3Hough::~AliL3Hough()
 {

+  //dtor
+

   CleanUp();
   if(fMerger)
     delete fMerger;
   CleanUp();
   if(fMerger)
     delete fMerger;


@@ -72,6 +92,8 @@ AliL3Hough::~AliL3Hough()
     delete fPeakFinder;
   if(fGlobalMerger)
     delete fGlobalMerger;
     delete fPeakFinder;
   if(fGlobalMerger)
     delete fGlobalMerger;

+  if(fTransform)
+    delete fTransform;

 }
 
 void AliL3Hough::CleanUp()
 }
 
 void AliL3Hough::CleanUp()


@@ -96,8 +118,10 @@ void AliL3Hough::CleanUp()
 
 void AliL3Hough::Init()
 {
 
 void AliL3Hough::Init()
 {

+  fPeakThreshold = 0;

   fNPatches = NPatches;
   fNPatches = NPatches;

-  fHoughTransformer = new AliL3HoughTransformer*[fNPatches];
+  fTransform = new AliL3Transform(fPath);
+  fHoughTransformer = new AliL3HoughBaseTransformer*[fNPatches];

 #ifdef use_aliroot
   fMemHandler = new AliL3FileHandler*[fNPatches];
 #else
 #ifdef use_aliroot
   fMemHandler = new AliL3FileHandler*[fNPatches];
 #else


@@ -108,7 +132,9 @@ void AliL3Hough::Init()
   for(Int_t i=0; i<fNPatches; i++)
     {
       fHoughTransformer[i] = new AliL3HoughTransformer(1,i,fNEtaSegments);
   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]->SetTransformer(fTransform);
+      //fHoughTransformer[i]->CreateHistograms(64,-0.003,0.003,64,-0.26,0.26);
+      fHoughTransformer[i]->CreateHistograms(64,0.1,64,-30,30);

       fHoughTransformer[i]->SetThreshold(3);
       fEval[i] = new AliL3HoughEval();
       fTracks[i] = new AliL3TrackArray("AliL3HoughTrack");
       fHoughTransformer[i]->SetThreshold(3);
       fEval[i] = new AliL3HoughEval();
       fTracks[i] = new AliL3TrackArray("AliL3HoughTrack");


@@ -124,6 +150,7 @@ void AliL3Hough::Init()
   fPeakFinder = new AliL3HoughMaxFinder("KappaPhi");
   fMerger = new AliL3HoughMerger(fNPatches);
   fInterMerger = new AliL3HoughIntMerger();
   fPeakFinder = new AliL3HoughMaxFinder("KappaPhi");
   fMerger = new AliL3HoughMerger(fNPatches);
   fInterMerger = new AliL3HoughIntMerger();

+  fGlobalMerger = 0;

 }
 
 void AliL3Hough::Process(Int_t minslice,Int_t maxslice)
 }
 
 void AliL3Hough::Process(Int_t minslice,Int_t maxslice)


@@ -175,7 +202,7 @@ void AliL3Hough::ReadData(Int_t slice)
     }
 }
 
     }
 }
 

-void AliL3Hough::Transform()
+void AliL3Hough::Transform(Int_t row_range)

 {
   //Transform all data given to the transformer within the given slice
   //(after ReadData(slice))
 {
   //Transform all data given to the transformer within the given slice
   //(after ReadData(slice))


@@ -183,7 +210,10 @@ void AliL3Hough::Transform()
   for(Int_t i=0; i<fNPatches; i++)
     {
       fHoughTransformer[i]->Reset();//Reset the histograms
   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);

     }
 }
 
     }
 }
 


@@ -191,10 +221,8 @@ void AliL3Hough::MergePatches()
 {
   if(fAddHistograms) //Nothing to merge here
     return;
 {
   if(fAddHistograms) //Nothing to merge here
     return;

-  AliL3Transform *tr = new AliL3Transform();
-  fMerger->SetTransformer(tr);
+  fMerger->SetTransformer(fTransform);

   fMerger->MergePatches(kTRUE);
   fMerger->MergePatches(kTRUE);

-  delete tr;

 }
 
 void AliL3Hough::MergeInternally()
 }
 
 void AliL3Hough::MergeInternally()


@@ -225,7 +253,7 @@ void AliL3Hough::ProcessPatchIter(Int_t patch)
   //transform + peakfinding + evaluation + transform +...
 
   Int_t num_of_tries = 10;
   //transform + peakfinding + evaluation + transform +...
 
   Int_t num_of_tries = 10;

-  AliL3HoughTransformer *tr = fHoughTransformer[patch];
+  AliL3HoughBaseTransformer *tr = fHoughTransformer[patch];

   AliL3TrackArray *tracks = fTracks[patch];
   tracks->Reset();
   AliL3HoughEval *ev = fEval[patch];
   AliL3TrackArray *tracks = fTracks[patch];
   tracks->Reset();
   AliL3HoughEval *ev = fEval[patch];


@@ -243,7 +271,7 @@ void AliL3Hough::ProcessPatchIter(Int_t patch)
          hist = tr->GetHistogram(i);
          if(hist->GetNEntries()==0) continue;
          fPeakFinder->SetHistogram(hist);
          hist = tr->GetHistogram(i);
          if(hist->GetNEntries()==0) continue;
          fPeakFinder->SetHistogram(hist);

-         Int_t n=1;
+         //Int_t n=1;

          Float_t x,y;
          //fPeakFinder->FindAbsMaxima(*x,*y);
          fPeakFinder->FindPeak(3,0.95,5,x,y);
          Float_t x,y;
          //fPeakFinder->FindAbsMaxima(*x,*y);
          fPeakFinder->FindPeak(3,0.95,5,x,y);


@@ -287,28 +315,33 @@ void AliL3Hough::FindTrackCandidates()
     n_patches = 1; //Histograms has been added.
   else
     n_patches = fNPatches;
     n_patches = 1; //Histograms has been added.
   else
     n_patches = fNPatches;

+

   
   for(Int_t i=0; i<n_patches; i++)
     {
   
   for(Int_t i=0; i<n_patches; i++)
     {

-      AliL3HoughTransformer *tr = fHoughTransformer[i];
+      AliL3HoughBaseTransformer *tr = fHoughTransformer[i];
+      Double_t eta_slice = (tr->GetEtaMax()-tr->GetEtaMin()/tr->GetNEtaSegments());

       fTracks[i]->Reset();
       for(Int_t j=0; j<fNEtaSegments; j++)
        {
          AliL3Histogram *hist = tr->GetHistogram(j);
          if(hist->GetNEntries()==0) continue;
          fPeakFinder->SetHistogram(hist);
       fTracks[i]->Reset();
       for(Int_t j=0; j<fNEtaSegments; j++)
        {
          AliL3Histogram *hist = tr->GetHistogram(j);
          if(hist->GetNEntries()==0) continue;
          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);
+         fPeakFinder->SetThreshold(fPeakThreshold);
+         Int_t n=20;
+         Float_t x[n];
+         Float_t y[n];
+         Int_t weight[n];
+         //fPeakFinder->FindPeak1(x,y,weight,n,2,1);
+         fPeakFinder->FindMaxima(x,y,weight,n);

          for(Int_t k=0; k<n; k++)
            {
              if(weight[k] == 0) continue;
          for(Int_t k=0; k<n; k++)
            {
              if(weight[k] == 0) continue;

+             

              AliL3HoughTrack *track = (AliL3HoughTrack*)fTracks[i]->NextTrack();
              track->SetTrackParameters(x[k],y[k],weight[k]);
              track->SetEtaIndex(j);
              AliL3HoughTrack *track = (AliL3HoughTrack*)fTracks[i]->NextTrack();
              track->SetTrackParameters(x[k],y[k],weight[k]);
              track->SetEtaIndex(j);

-             track->SetEta((Double_t)(j*tr->GetEtaSlice()));
+             track->SetEta((Double_t)(j*eta_slice));

              track->SetRowRange(NRows[0][0],NRows[5][1]);
            }
        }
              track->SetRowRange(NRows[0][0],NRows[5][1]);
            }
        }


@@ -333,6 +366,7 @@ void AliL3Hough::Evaluate(Int_t road_width)
   for(Int_t i=0; i<fNPatches; i++)
     {
       fEval[i]->InitTransformer(fHoughTransformer[i]);
   for(Int_t i=0; i<fNPatches; i++)
     {
       fEval[i]->InitTransformer(fHoughTransformer[i]);

+      continue;

       fEval[i]->SetNumOfRowsToMiss(2);
       fEval[i]->SetNumOfPadsToLook(road_width);
       if(fAddHistograms)
       fEval[i]->SetNumOfRowsToMiss(2);
       fEval[i]->SetNumOfPadsToLook(road_width);
       if(fAddHistograms)

diff --git a/HLT/hough/AliL3Hough.h b/HLT/hough/AliL3Hough.h
index ff161ce5577d59c39304006b2b85ec9c8ce78982..44f9b4ef95b7262fd397601c16b3a9cfc1dd811e 100644 (file)
--- a/HLT/hough/AliL3Hough.h
+++ b/HLT/hough/AliL3Hough.h
@@ -4,7 +4,7 @@
 #include "AliL3RootTypes.h"
 
 class AliL3HoughMaxFinder;
 #include "AliL3RootTypes.h"
 
 class AliL3HoughMaxFinder;

-class AliL3HoughTransformer;
+class AliL3HoughBaseTransformer;

 class AliL3Histogram;
 class AliL3MemHandler;
 class AliL3FileHandler;
 class AliL3Histogram;
 class AliL3MemHandler;
 class AliL3FileHandler;


@@ -14,6 +14,7 @@ class AliL3TrackArray;
 class AliL3HoughMerger;
 class AliL3HoughIntMerger;
 class AliL3HoughGlobalMerger;
 class AliL3HoughMerger;
 class AliL3HoughIntMerger;
 class AliL3HoughGlobalMerger;

+class AliL3Transform;

 
 class AliL3Hough {
   
 
 class AliL3Hough {
   


@@ -25,18 +26,20 @@ class AliL3Hough {
   Bool_t fWriteDigits;
   Int_t fNEtaSegments;
   Int_t fNPatches;
   Bool_t fWriteDigits;
   Int_t fNEtaSegments;
   Int_t fNPatches;

+  Int_t fPeakThreshold;

 #ifdef use_aliroot
   AliL3FileHandler **fMemHandler; //!
 #else
   AliL3MemHandler **fMemHandler; //!
 #endif
 #ifdef use_aliroot
   AliL3FileHandler **fMemHandler; //!
 #else
   AliL3MemHandler **fMemHandler; //!
 #endif

-  AliL3HoughTransformer **fHoughTransformer; //!
+  AliL3HoughBaseTransformer **fHoughTransformer; //!

   AliL3HoughEval **fEval; //!
   AliL3HoughMaxFinder *fPeakFinder; //!
   AliL3TrackArray **fTracks; //!
   AliL3HoughMerger *fMerger; //!
   AliL3HoughIntMerger *fInterMerger; //!
   AliL3HoughGlobalMerger *fGlobalMerger; //!
   AliL3HoughEval **fEval; //!
   AliL3HoughMaxFinder *fPeakFinder; //!
   AliL3TrackArray **fTracks; //!
   AliL3HoughMerger *fMerger; //!
   AliL3HoughIntMerger *fInterMerger; //!
   AliL3HoughGlobalMerger *fGlobalMerger; //!

+  AliL3Transform *fTransform; //!

 
   void CleanUp();
   void Init();
 
   void CleanUp();
   void Init();


@@ -49,7 +52,7 @@ class AliL3Hough {
   
   void Process(Int_t minslice,Int_t maxslice);
   void ReadData(Int_t slice);
   
   void Process(Int_t minslice,Int_t maxslice);
   void ReadData(Int_t slice);

-  void Transform();
+  void Transform(Int_t row_range = -1);

   void ProcessSliceIter();
   void ProcessPatchIter(Int_t patch);
   void MergePatches();
   void ProcessSliceIter();
   void ProcessPatchIter(Int_t patch);
   void MergePatches();


@@ -69,9 +72,10 @@ class AliL3Hough {
   void SetAddHistograms() {fAddHistograms = kTRUE;}
   void DoIterative() {fDoIterative = kTRUE;}
   void SetWriteDigits() {fWriteDigits = kTRUE;}
   void SetAddHistograms() {fAddHistograms = kTRUE;}
   void DoIterative() {fDoIterative = kTRUE;}
   void SetWriteDigits() {fWriteDigits = kTRUE;}

+  void SetPeakThreshold(Int_t i) {fPeakThreshold = i;}

   
   //Getters
   
   //Getters

-  AliL3HoughTransformer *GetTransformer(Int_t i) {if(!fHoughTransformer[i]) return 0; return fHoughTransformer[i];}
+  AliL3HoughBaseTransformer *GetTransformer(Int_t i) {if(!fHoughTransformer[i]) return 0; return fHoughTransformer[i];}

   AliL3TrackArray *GetTracks(Int_t i) {if(!fTracks[i]) return 0; return fTracks[i];}
   AliL3HoughEval *GetEval(Int_t i) {if(!fEval[i]) return 0; return fEval[i];}
   AliL3HoughMerger *GetMerger() {if(!fMerger) return 0; return fMerger;}
   AliL3TrackArray *GetTracks(Int_t i) {if(!fTracks[i]) return 0; return fTracks[i];}
   AliL3HoughEval *GetEval(Int_t i) {if(!fEval[i]) return 0; return fEval[i];}
   AliL3HoughMerger *GetMerger() {if(!fMerger) return 0; return fMerger;}

diff --git a/HLT/hough/AliL3HoughBaseTransformer.cxx b/HLT/hough/AliL3HoughBaseTransformer.cxx
index 0e804a2c35e2b8cf3e07307861a10a6dbf1d4ad8..c04802143d2e7a8bcb585a8469525d1953b3f0fe 100644 (file)
--- a/HLT/hough/AliL3HoughBaseTransformer.cxx
+++ b/HLT/hough/AliL3HoughBaseTransformer.cxx
@@ -15,6 +15,9 @@
 // AliL3HoughBaseTransformer
 //
 // The base class for implementations of Hough Transform on ALICE TPC data.
 // AliL3HoughBaseTransformer
 //
 // The base class for implementations of Hough Transform on ALICE TPC data.

+//
+// This is an abstract class, and is only meant to provide the interface
+// to the different implementations.

 
 ClassImp(AliL3HoughBaseTransformer)
 
 
 ClassImp(AliL3HoughBaseTransformer)
 


@@ -23,7 +26,6 @@ AliL3HoughBaseTransformer::AliL3HoughBaseTransformer()
   //Default constructor
   fTransform = 0;
   fDigitRowData = 0;
   //Default constructor
   fTransform = 0;
   fDigitRowData = 0;

-  

 }
 
 AliL3HoughBaseTransformer::AliL3HoughBaseTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments)
 }
 
 AliL3HoughBaseTransformer::AliL3HoughBaseTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments)


@@ -33,14 +35,12 @@ AliL3HoughBaseTransformer::AliL3HoughBaseTransformer(Int_t slice,Int_t patch,Int
   fNEtaSegments = n_eta_segments;
   fEtaMin = 0;
   fEtaMax = fSlice < 18 ? 0.9 : -0.9;
   fNEtaSegments = n_eta_segments;
   fEtaMin = 0;
   fEtaMax = fSlice < 18 ? 0.9 : -0.9;

-  fTransform = new AliL3Transform();

   fThreshold = 0;
   fThreshold = 0;

-  fDigitRowData=0;
+  fDigitRowData = 0;
+  fTransform = 0;

 }
 
 AliL3HoughBaseTransformer::~AliL3HoughBaseTransformer()
 {
 }
 
 AliL3HoughBaseTransformer::~AliL3HoughBaseTransformer()
 {

-  if(fTransform)
-    delete fTransform;
-}

 
 

+}

diff --git a/HLT/hough/AliL3HoughBaseTransformer.h b/HLT/hough/AliL3HoughBaseTransformer.h
index 9f294af72bd79c7c4939a2d4f1154fd6f7c6ed42..a1a298691b49ac6779064ccdb86813a337aa09f4 100644 (file)
--- a/HLT/hough/AliL3HoughBaseTransformer.h
+++ b/HLT/hough/AliL3HoughBaseTransformer.h
@@ -22,12 +22,13 @@ class AliL3HoughBaseTransformer {
   
  protected:
   AliL3Transform *fTransform; //!
   
  protected:
   AliL3Transform *fTransform; //!

-    
+

  public:
   AliL3HoughBaseTransformer(); 
   AliL3HoughBaseTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments);
   virtual ~AliL3HoughBaseTransformer();
   
  public:
   AliL3HoughBaseTransformer(); 
   AliL3HoughBaseTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments);
   virtual ~AliL3HoughBaseTransformer();
   

+  void SetTransformer(AliL3Transform *tr) {fTransform = tr;}

   void SetInputData(UInt_t ndigits,AliL3DigitRowData *ptr) {fDigitRowData = ptr;}
   
   virtual void CreateHistograms(Int_t nxbin,Double_t ptmin,Int_t nybin,Double_t phimin,Double_t phimax) = 0;
   void SetInputData(UInt_t ndigits,AliL3DigitRowData *ptr) {fDigitRowData = ptr;}
   
   virtual void CreateHistograms(Int_t nxbin,Double_t ptmin,Int_t nybin,Double_t phimin,Double_t phimax) = 0;

diff --git a/HLT/hough/AliL3HoughEval.cxx b/HLT/hough/AliL3HoughEval.cxx
index 3a64d62be8060b99e11f3ffb5db4aafaf7154623..05e3a4ca3e756b2c501108ed9b31d1caf5ed6be2 100644 (file)
--- a/HLT/hough/AliL3HoughEval.cxx
+++ b/HLT/hough/AliL3HoughEval.cxx
@@ -14,7 +14,7 @@
 #include "AliL3TrackArray.h"
 #include "AliL3Logging.h"
 #include "AliL3HoughEval.h"
 #include "AliL3TrackArray.h"
 #include "AliL3Logging.h"
 #include "AliL3HoughEval.h"

-#include "AliL3HoughTransformer.h"
+#include "AliL3HoughBaseTransformer.h"

 #include "AliL3DigitData.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3Transform.h"
 #include "AliL3DigitData.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3Transform.h"


@@ -54,7 +54,7 @@ AliL3HoughEval::~AliL3HoughEval()
     }
 }
 
     }
 }
 

-void AliL3HoughEval::InitTransformer(AliL3HoughTransformer *transformer)
+void AliL3HoughEval::InitTransformer(AliL3HoughBaseTransformer *transformer)

 {
   fHoughTransformer = transformer;
   fSlice = fHoughTransformer->GetSlice();
 {
   fHoughTransformer = transformer;
   fSlice = fHoughTransformer->GetSlice();

diff --git a/HLT/hough/AliL3HoughEval.h b/HLT/hough/AliL3HoughEval.h
index 029d314bee7a9ab8c98e4f8ad829930f5c1706ca..f88d7f0fd1ba3a018d2231fa0de56b7a772c307a 100644 (file)
--- a/HLT/hough/AliL3HoughEval.h
+++ b/HLT/hough/AliL3HoughEval.h
@@ -4,7 +4,7 @@
 #include "AliL3RootTypes.h"
 
 
 #include "AliL3RootTypes.h"
 
 

-class AliL3HoughTransformer;
+class AliL3HoughBaseTransformer;

 class AliL3Transform;
 class AliL3HoughTrack;
 class AliL3DigitRowData;
 class AliL3Transform;
 class AliL3HoughTrack;
 class AliL3DigitRowData;


@@ -29,14 +29,14 @@ class AliL3HoughEval {
   Bool_t fRemoveFoundTracks;
   
   AliL3Transform *fTransform; //!
   Bool_t fRemoveFoundTracks;
   
   AliL3Transform *fTransform; //!

-  AliL3HoughTransformer *fHoughTransformer; //!
+  AliL3HoughBaseTransformer *fHoughTransformer; //!

   AliL3DigitRowData **fRowPointers; //!
   
  public:
   AliL3HoughEval(); 
   virtual ~AliL3HoughEval();
   
   AliL3DigitRowData **fRowPointers; //!
   
  public:
   AliL3HoughEval(); 
   virtual ~AliL3HoughEval();
   

-  void InitTransformer(AliL3HoughTransformer *transformer);
+  void InitTransformer(AliL3HoughBaseTransformer *transformer);

   void GenerateLUT();
   void DisplayEtaSlice(Int_t eta_index,AliL3Histogram *hist);
   Bool_t LookInsideRoad(AliL3HoughTrack *track,Int_t eta_index,Bool_t remove=kFALSE);
   void GenerateLUT();
   void DisplayEtaSlice(Int_t eta_index,AliL3Histogram *hist);
   Bool_t LookInsideRoad(AliL3HoughTrack *track,Int_t eta_index,Bool_t remove=kFALSE);

diff --git a/HLT/hough/AliL3HoughTrack.cxx b/HLT/hough/AliL3HoughTrack.cxx
index 8746654041a85278f1da1bf042c8393a84bd7ae2..9baff670de76970785e76e7f1f06ef90eb2a8ebb 100644 (file)
--- a/HLT/hough/AliL3HoughTrack.cxx
+++ b/HLT/hough/AliL3HoughTrack.cxx
@@ -24,7 +24,6 @@ AliL3HoughTrack::AliL3HoughTrack()
   
   fWeight = 0;
   fMinDist=0;
   
   fWeight = 0;
   fMinDist=0;

-  fTransform = new AliL3Transform();

   fDLine = 0;
   fPsiLine = 0;
   fIsHelix = true;
   fDLine = 0;
   fPsiLine = 0;
   fIsHelix = true;


@@ -34,9 +33,7 @@ AliL3HoughTrack::AliL3HoughTrack()
 
 AliL3HoughTrack::~AliL3HoughTrack()
 {
 
 AliL3HoughTrack::~AliL3HoughTrack()
 {

-  //Destructor
-  if(fTransform)
-    delete fTransform;
+  

 }
 
 void AliL3HoughTrack::Set(AliL3Track *track)
 }
 
 void AliL3HoughTrack::Set(AliL3Track *track)


@@ -205,6 +202,7 @@ void AliL3HoughTrack::SetLineParameters(Double_t psi,Double_t D,Int_t weight,Int
 
   //Transform line parameters to coordinate system of slice:
   
 
   //Transform line parameters to coordinate system of slice:
   

+  /*

   D = D + fTransform->Row2X(ref_row)*cos(psi);
 
   fDLine = D;
   D = D + fTransform->Row2X(ref_row)*cos(psi);
 
   fDLine = D;


@@ -213,7 +211,7 @@ void AliL3HoughTrack::SetLineParameters(Double_t psi,Double_t D,Int_t weight,Int
   SetNHits(weight);
   SetRowRange(rowrange[0],rowrange[1]);
   fIsHelix = false;
   SetNHits(weight);
   SetRowRange(rowrange[0],rowrange[1]);
   fIsHelix = false;

-
+  */

 }
 
 void AliL3HoughTrack::SetBestMCid(Int_t mcid,Double_t min_dist)
 }
 
 void AliL3HoughTrack::SetBestMCid(Int_t mcid,Double_t min_dist)


@@ -230,7 +228,7 @@ void AliL3HoughTrack::SetBestMCid(Int_t mcid,Double_t min_dist)
 void AliL3HoughTrack::GetLineCrossingPoint(Int_t padrow,Double_t *xy)
 {
   
 void AliL3HoughTrack::GetLineCrossingPoint(Int_t padrow,Double_t *xy)
 {
   

-
+  /*

   if(fIsHelix)
     {
       printf("AliL3HoughTrack::GetLineCrossingPoint : Track is not a line\n");
   if(fIsHelix)
     {
       printf("AliL3HoughTrack::GetLineCrossingPoint : Track is not a line\n");


@@ -244,7 +242,7 @@ void AliL3HoughTrack::GetLineCrossingPoint(Int_t padrow,Double_t *xy)
   Double_t yhit = a*xhit + b;
   xy[0] = xhit;
   xy[1] = yhit;
   Double_t yhit = a*xhit + b;
   xy[0] = xhit;
   xy[1] = yhit;

-
+  */

 }
 
 /*
 }
 
 /*

diff --git a/HLT/hough/AliL3HoughTrack.h b/HLT/hough/AliL3HoughTrack.h
index 9261fb28d27806e7f39465080886444f8f7fec8a..b687308c7f24adfcb6f4f7ccf32c55510e502891 100644 (file)
--- a/HLT/hough/AliL3HoughTrack.h
+++ b/HLT/hough/AliL3HoughTrack.h
@@ -3,13 +3,10 @@
 
 #include "AliL3Track.h"
 
 
 #include "AliL3Track.h"
 

-class AliL3Transform;
-

 class AliL3HoughTrack : public AliL3Track {
   
  private:
 class AliL3HoughTrack : public AliL3Track {
   
  private:

-
-  AliL3Transform *fTransform; //!
+  

   Double_t fMinDist;
   Int_t fWeight;
   Int_t fEtaIndex;
   Double_t fMinDist;
   Int_t fWeight;
   Int_t fEtaIndex;

diff --git a/HLT/hough/AliL3HoughTransformer.cxx b/HLT/hough/AliL3HoughTransformer.cxx
index 399a7534593010e2dc9dadb5c4be410974de0ae1..753f6e122bfa2f49cca416c49fab75346817c11d 100644 (file)
--- a/HLT/hough/AliL3HoughTransformer.cxx
+++ b/HLT/hough/AliL3HoughTransformer.cxx
@@ -28,8 +28,7 @@ AliL3HoughTransformer::AliL3HoughTransformer()
 AliL3HoughTransformer::AliL3HoughTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments) : AliL3HoughBaseTransformer(slice,patch,n_eta_segments)
 {
   //Normal constructor
 AliL3HoughTransformer::AliL3HoughTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments) : AliL3HoughBaseTransformer(slice,patch,n_eta_segments)
 {
   //Normal constructor

-  
-   fParamSpace = 0;
+  fParamSpace = 0;

 }
 
 AliL3HoughTransformer::~AliL3HoughTransformer()
 }
 
 AliL3HoughTransformer::~AliL3HoughTransformer()


@@ -123,7 +122,14 @@ void AliL3HoughTransformer::TransformCircle()
   AliL3DigitRowData *tempPt = GetDataPointer();
   if(!tempPt)
     {
   AliL3DigitRowData *tempPt = GetDataPointer();
   if(!tempPt)
     {

-      printf("\nAliL3HoughTransformer::TransformCircle : No input data!!!\n\n");
+      LOG(AliL3Log::kError,"AliL3HoughTransformer::TransformCircle","Data")
+       <<"No input data "<<ENDLOG;
+      return;
+    }
+  if(!fTransform)
+    {
+      LOG(AliL3Log::kError,"AliL3HoughTransformer::TransformCircle","Transformer")
+       <<"No AliL3Transform object"<<ENDLOG;

       return;
     }
   
       return;
     }
   


@@ -194,7 +200,15 @@ void AliL3HoughTransformer::TransformCircleC(Int_t row_range)
   
   AliL3DigitRowData *tempPt = GetDataPointer();
   if(!tempPt)
   
   AliL3DigitRowData *tempPt = GetDataPointer();
   if(!tempPt)

-    printf("\nAliL3HoughTransformer::TransformCircleC() : Zero data pointer\n");
+    LOG(AliL3Log::kError,"AliL3HoughTransformer::TransformCircleC","Data")
+      <<"No input data "<<ENDLOG;
+ 
+  if(!fTransform)
+    {
+      LOG(AliL3Log::kError,"AliL3HoughTransformer::TransformCircleC","Transformer")
+       <<"No AliL3Transform object"<<ENDLOG;
+      return;
+    }

   
   Int_t counter=0;
   for(Int_t i=NRows[GetPatch()][0]; i<=NRows[GetPatch()][1]; i++)
   
   Int_t counter=0;
   for(Int_t i=NRows[GetPatch()][0]; i<=NRows[GetPatch()][1]; i++)


@@ -283,7 +297,14 @@ void AliL3HoughTransformer::TransformLine()
   AliL3DigitRowData *tempPt = GetDataPointer();
   if(!tempPt)
     {
   AliL3DigitRowData *tempPt = GetDataPointer();
   if(!tempPt)
     {

-      printf("\nAliL3HoughTransformer::TransformLine : No input data!!!\n\n");
+      LOG(AliL3Log::kError,"AliL3HoughTransformer::TransformLine","Data")
+       <<"No input data "<<ENDLOG;
+      return;
+    }
+  if(!fTransform)
+    {
+      LOG(AliL3Log::kError,"AliL3HoughTransformer::TransformLine","Transformer")
+       <<"No AliL3Transform object"<<ENDLOG;

       return;
     }
   
       return;
     }
   

diff --git a/HLT/hough/AliL3HoughTransformer.h b/HLT/hough/AliL3HoughTransformer.h
index d8e3c74f8963b36ce6a0836a5bf27b743f88bdfc..9bd33be39432afa6752bb934730d9be2ba77a4e6 100644 (file)
--- a/HLT/hough/AliL3HoughTransformer.h
+++ b/HLT/hough/AliL3HoughTransformer.h
@@ -30,7 +30,7 @@ class AliL3HoughTransformer : public AliL3HoughBaseTransformer {
   AliL3Histogram *GetHistogram(Int_t eta_index);
   
 
   AliL3Histogram *GetHistogram(Int_t eta_index);
   
 

-  ClassDef(AliL3HoughTransformer,1) //Hough transformation class
+  ClassDef(AliL3HoughTransformer,1) //Normal Hough transformation class

 
 };
 
 
 };
 

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 6d1a8a6fbcb3284c942fa0f968695dc5e69fc36f..6e75ceea5c023466778cd58d5d5e2367dbce218b 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -54,7 +54,7 @@ endif
 
 SRCS   = AliL3HoughTransformer.cxx AliL3Hough.cxx AliL3HoughTrack.cxx\
          AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerger.cxx \
 
 SRCS   = AliL3HoughTransformer.cxx AliL3Hough.cxx AliL3HoughTrack.cxx\
          AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerger.cxx \

-         AliL3Histogram.cxx AliL3Histogram1D.cxx \
+         AliL3Histogram.cxx AliL3Histogram1D.cxx AliL3HoughBaseTransformer.cxx \

          AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx 
 
 DICT = AliL3HoughCint.cxx
          AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx 
 
 DICT = AliL3HoughCint.cxx