Little changes to make g++ version 3.2 compile the hough library.
authorloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 25 Aug 2002 17:04:48 +0000 (17:04 +0000)
committerloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 25 Aug 2002 17:04:48 +0000 (17:04 +0000)
20 files changed:
HLT/hough/AliL3Histogram.cxx
HLT/hough/AliL3Histogram.h
HLT/hough/AliL3Histogram1D.cxx
HLT/hough/AliL3HistogramAdaptive.h
HLT/hough/AliL3Hough.cxx
HLT/hough/AliL3HoughBaseTransformer.cxx
HLT/hough/AliL3HoughBaseTransformer.h
HLT/hough/AliL3HoughClusterTransformer.cxx
HLT/hough/AliL3HoughDisplay.cxx
HLT/hough/AliL3HoughEval.cxx
HLT/hough/AliL3HoughGlobalMerger.cxx
HLT/hough/AliL3HoughIntMerger.cxx
HLT/hough/AliL3HoughLinkDef.h
HLT/hough/AliL3HoughMaxFinder.cxx
HLT/hough/AliL3HoughMaxFinder.h
HLT/hough/AliL3HoughMerger.cxx
HLT/hough/AliL3HoughTrack.cxx
HLT/hough/AliL3HoughTransformer.cxx
HLT/hough/AliL3HoughTransformer.h
HLT/hough/Makefile

index 1a11121..b8e4de5 100644 (file)
@@ -3,10 +3,15 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV
 
-#include <string.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3Histogram.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3Histogram
 //
@@ -23,6 +28,8 @@ AliL3Histogram::AliL3Histogram()
   fYmin = 0;
   fXmax = 0;
   fYmax = 0;
+  fBinwidthX = 0;
+  fBinwidthY = 0;  
   fFirstXbin = 0;
   fLastXbin = 0;
   fFirstYbin = 0;
@@ -35,21 +42,22 @@ AliL3Histogram::AliL3Histogram()
 #endif
 }
 
-  
 AliL3Histogram::AliL3Histogram(Char_t *name,Char_t *id,
                               Int_t nxbin,Double_t xmin,Double_t xmax,
                               Int_t nybin,Double_t ymin,Double_t ymax) 
 {
-  
   strcpy(fName,name);
+
   fNxbins = nxbin;
   fNybins = nybin;
   fNcells = (nxbin+2)*(nybin+2);
-  
   fXmin = xmin;
   fYmin = ymin;
   fXmax = xmax;
   fYmax = ymax;
+  fBinwidthX = (fXmax - fXmin) / fNxbins;
+  fBinwidthY = (fYmax - fYmin) / fNybins;
+  
   fEntries = 0;
   fFirstXbin = 1;
   fFirstYbin = 1;
@@ -73,15 +81,13 @@ AliL3Histogram::~AliL3Histogram()
   if(fRootHisto)
     delete fRootHisto;
 #endif
-  
 }
 
-
 void AliL3Histogram::Reset()
 {
-  
-  for(Int_t i=0; i<fNcells; i++)
-    fContent[i] = 0;
+  if(fContent)
+    for(Int_t i=0; i<fNcells; i++) fContent[i] = 0;
+
   fEntries=0;
 }
 
@@ -89,12 +95,10 @@ void AliL3Histogram::Fill(Double_t x,Double_t y,Int_t weight)
 {
   Int_t bin = FindBin(x,y);
   AddBinContent(bin,weight);
-
 }
 
 Int_t AliL3Histogram::FindBin(Double_t x,Double_t y)
 {
-  
   Int_t xbin = FindXbin(x);
   Int_t ybin = FindYbin(y);
   
@@ -107,7 +111,6 @@ Int_t AliL3Histogram::FindXbin(Double_t x)
     return 0;
   
   return 1 + (Int_t)(fNxbins*(x-fXmin)/(fXmax-fXmin));
-
 }
 
 Int_t AliL3Histogram::FindYbin(Double_t y)
@@ -116,7 +119,6 @@ Int_t AliL3Histogram::FindYbin(Double_t y)
     return 0;
   
   return 1 + (Int_t)(fNybins*(y-fYmin)/(fYmax-fYmin));
-
 }
 
 Int_t AliL3Histogram::GetBin(Int_t xbin,Int_t ybin)
@@ -127,6 +129,7 @@ Int_t AliL3Histogram::GetBin(Int_t xbin,Int_t ybin)
        "xbin out of range "<<xbin<<ENDLOG;
       return 0;
     }
+
   if(ybin < 0 || ybin > GetLastYbin())
     {
       LOG(AliL3Log::kError,"AliL3Histogram::Getbin","array")<<AliL3Log::kDec<<
@@ -168,10 +171,10 @@ void AliL3Histogram::SetBinContent(Int_t bin,Int_t value)
        "bin out of range "<<bin<<ENDLOG;
       return;
     }
+
   if(bin == 0)
     return;
   fContent[bin]=value;
-  
 }
 
 void AliL3Histogram::AddBinContent(Int_t xbin,Int_t ybin,Int_t weight)
@@ -180,7 +183,6 @@ void AliL3Histogram::AddBinContent(Int_t xbin,Int_t ybin,Int_t weight)
   if(bin == 0)
     return;
   AddBinContent(bin,weight);
-
 }
 
 void AliL3Histogram::AddBinContent(Int_t bin,Int_t weight)
@@ -230,21 +232,16 @@ void AliL3Histogram::Add(AliL3Histogram *h1,Double_t weight)
 
 Double_t AliL3Histogram::GetBinCenterX(Int_t xbin)
 {
-  
-  Double_t binwidth = (fXmax - fXmin) / fNxbins;
-  return fXmin + (xbin-1) * binwidth + 0.5*binwidth;
-  
+  //  return fXmin + (xbin-1) * fBinwidthX + 0.5*fBinwidthX;
+  return fXmin + (xbin-0.5) * fBinwidthX;
 }
 
 Double_t AliL3Histogram::GetBinCenterY(Int_t ybin)
 {
-  
-  Double_t binwidth = (fYmax - fYmin) / fNybins;
-  return fYmin + (ybin-1) * binwidth + 0.5*binwidth;
-  
+  //  return fYmin + (ybin-1) * fBinwidthY + 0.5*fBinwidthY;
+  return fYmin + (ybin-0.5) * fBinwidthY;
 }
 
-
 void AliL3Histogram::Draw(Char_t *option)
 {
 #ifdef use_root
index f8919ea..476115c 100644 (file)
@@ -1,7 +1,6 @@
 #ifndef ALIL3_HISTOGRAM
 #define ALIL3_HISTOGRAM
 
-#include <stream.h>
 #include "AliL3RootTypes.h"
 
 #ifdef use_root
@@ -14,6 +13,7 @@ class AliL3Histogram {
   
   Int_t *fContent; //!
   Char_t fName[100];
+  //Char_t fID[100]; //not used 
   Int_t fNxbins;
   Int_t fNybins;
   Int_t fNcells;
@@ -28,12 +28,15 @@ class AliL3Histogram {
   Double_t fYmin;
   Double_t fXmax;
   Double_t fYmax;
-  
+  Double_t fBinwidthX;
+  Double_t fBinwidthY;
+
 #ifdef use_root
   TH2F *fRootHisto;
 #endif  
   
  public:
+
   AliL3Histogram();
   AliL3Histogram(Char_t *name,Char_t *id,Int_t nxbin,Double_t xmin,Double_t xmax,Int_t nybin,Double_t ymin,Double_t ymax);
   virtual ~AliL3Histogram();
@@ -75,7 +78,6 @@ class AliL3Histogram {
   Int_t GetNbinsY() {return fNybins;}
   Int_t GetNEntries() {return fEntries;}
   
-  
   ClassDef(AliL3Histogram,1) //2D histogram class
     
 };
@@ -85,7 +87,7 @@ inline TH2F *AliL3Histogram::GetRootHisto()
 {
   if(!fRootHisto)
     {
-      cerr<<"AliL3Histogram::GetRootHisto() : You must first Draw histogram before accessing it"<<endl;
+      STDCERR<<"AliL3Histogram::GetRootHisto() : You must first Draw histogram before accessing it"<<STDENDL;
       return 0;
     }
   else
@@ -94,7 +96,7 @@ inline TH2F *AliL3Histogram::GetRootHisto()
 #else
 inline void *AliL3Histogram::GetRootHisto()
 {
-  cerr<<"AliL3Histogram::GetRootHisto() : You must compile with ROOT in order to interface the ROOT histogram"<<endl;
+  STDCERR<<"AliL3Histogram::GetRootHisto() : You must compile with ROOT in order to interface the ROOT histogram"<<STDENDL;
   return 0;
 }
 #endif
index 30446b4..9e3eef9 100644 (file)
@@ -3,10 +3,15 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV
 
-#include <string.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3Histogram1D.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3Histogram1D
 //
@@ -28,7 +33,6 @@ AliL3Histogram1D::AliL3Histogram1D()
   fContent = 0;
   
 }
-
   
 AliL3Histogram1D::AliL3Histogram1D(Char_t *name,Char_t *id,Int_t nxbin,Double_t xmin,Double_t xmax)
 
index 65c0c07..7725511 100644 (file)
@@ -1,7 +1,6 @@
 #ifndef ALIL3_HISTOGRAMADAPTIVE
 #define ALIL3_HISTOGRAMADAPTIVE
 
-#include <stream.h>
 #include "AliL3RootTypes.h"
 #include "AliL3Histogram.h"
 
index 1210d61..989cc92 100644 (file)
@@ -3,14 +3,13 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-
-#include <string.h>
+#include "AliL3StandardIncludes.h"
 #include <sys/time.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"
@@ -29,6 +28,9 @@
 #include "AliL3TrackArray.h"
 #include "AliL3HoughTrack.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
 
 /** /class AliL3Hough
 //<pre>
@@ -78,7 +80,7 @@ AliL3Hough::AliL3Hough()
   SetThreshold();
 }
 
-AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments=100,Bool_t bit8=kFALSE,Int_t tv=0)
+AliL3Hough::AliL3Hough(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv)
 {
   //Default ctor.
 
@@ -127,7 +129,7 @@ void AliL3Hough::CleanUp()
   */
 }
 
-void AliL3Hough::Init(Char_t *path,Bool_t binary,Int_t n_eta_segments=100,Bool_t bit8=kFALSE,Int_t tv=0)
+void AliL3Hough::Init(Char_t *path,Bool_t binary,Int_t n_eta_segments,Bool_t bit8,Int_t tv)
 {
   fBinary = binary;
   strcpy(fPath,path);
@@ -139,7 +141,7 @@ void AliL3Hough::Init(Char_t *path,Bool_t binary,Int_t n_eta_segments=100,Bool_t
   Init(); //do the rest
 }
 
-void AliL3Hough::Init(Bool_t doit=kFALSE, Bool_t addhists=kFALSE)
+void AliL3Hough::Init(Bool_t doit, Bool_t addhists)
 {
   fDoIterative   = doit; 
   fAddHistograms = addhists;
@@ -222,7 +224,7 @@ void AliL3Hough::Process(Int_t minslice,Int_t maxslice)
     }
 }
 
-void AliL3Hough::ReadData(Int_t slice,Int_t eventnr=0)
+void AliL3Hough::ReadData(Int_t slice,Int_t eventnr)
 {
   //Read data from files, binary or root.
   
@@ -261,7 +263,7 @@ void AliL3Hough::ReadData(Int_t slice,Int_t eventnr=0)
     }
 }
 
-void AliL3Hough::Transform(Int_t row_range=-1)
+void AliL3Hough::Transform(Int_t row_range)
 {
   //Transform all data given to the transformer within the given slice
   //(after ReadData(slice))
index 0321e06..f9d32fe 100644 (file)
@@ -3,9 +3,11 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include "AliL3MemHandler.h"
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3HoughBaseTransformer.h"
+#include "AliL3MemHandler.h"
 #include "AliL3DigitData.h"
 #include "AliL3Histogram.h"
 
@@ -23,7 +25,7 @@ AliL3HoughBaseTransformer::AliL3HoughBaseTransformer()
 {
   //Default constructor
   fDigitRowData = 0;
-
+  /*
   fSlice = 0;
   fPatch = 0;
   fNEtaSegments =0;
@@ -31,11 +33,13 @@ AliL3HoughBaseTransformer::AliL3HoughBaseTransformer()
   fEtaMax = 0;
   fLowerThreshold = 0;
   fUpperThreshold = 0;
+  */
 }
 
 AliL3HoughBaseTransformer::AliL3HoughBaseTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments)
 {
   fDigitRowData = 0;
+
   Init(slice,patch,n_eta_segments);
 }
 
@@ -43,7 +47,7 @@ AliL3HoughBaseTransformer::~AliL3HoughBaseTransformer()
 {
 }
 
-void AliL3HoughBaseTransformer::Init(Int_t slice=0,Int_t patch=0,Int_t n_eta_segments=100)
+void AliL3HoughBaseTransformer::Init(Int_t slice,Int_t patch,Int_t n_eta_segments)
 {
   fSlice = slice;
   fPatch = patch;
index 085798d..5ee8486 100644 (file)
@@ -30,6 +30,7 @@ class AliL3HoughBaseTransformer {
   AliL3DigitRowData *fDigitRowData; //!
   
  public:
+
   AliL3HoughBaseTransformer(); 
   AliL3HoughBaseTransformer(Int_t slice,Int_t patch,Int_t n_eta_segments);
   virtual ~AliL3HoughBaseTransformer();
index b18c8b3..3611c56 100644 (file)
@@ -3,15 +3,21 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include "AliL3MemHandler.h"
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3HoughClusterTransformer.h"
+#include "AliL3MemHandler.h"
 #include "AliL3SpacePointData.h"
 #include "AliL3Transform.h"
 #include "AliL3DigitData.h"
 #include "AliL3Histogram.h"
 #include "AliL3ClustFinderNew.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3HoughClusterTransformer
 //
index cd0903b..2c243bf 100644 (file)
@@ -3,7 +3,8 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include <TCanvas.h>
 #include <TView.h>
 #include <TPolyMarker3D.h>
 #include <TShape.h>
 #include <TFile.h>
 
+#include "AliL3Logging.h"
 #include "AliL3Transform.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3TrackArray.h"
-#include "AliL3HoughDisplay.h"
 #include "AliL3MemHandler.h"
+#include "AliL3HoughDisplay.h"
 
 //_____________________________________________________________
 // Display class for Hough transform code
index d7d168f..919177e 100644 (file)
@@ -3,16 +3,17 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #ifdef use_root
 #include <TH1.h>
 #include <TFile.h>
 #endif
-#include "AliL3MemHandler.h"
-#include "AliL3TrackArray.h"
+
 #include "AliL3Logging.h"
 #include "AliL3HoughEval.h"
+#include "AliL3MemHandler.h"
+#include "AliL3TrackArray.h"
 #include "AliL3HoughBaseTransformer.h"
 #include "AliL3DigitData.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3Histogram.h"
 #include "AliL3Histogram1D.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3HoughEval
 //
index 66c7af5..aeef4c7 100644 (file)
@@ -1,9 +1,8 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <stdlib.h>
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3HoughGlobalMerger.h"
index 5e7cee1..41bfa3e 100644 (file)
@@ -1,9 +1,8 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <stdlib.h>
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3HoughIntMerger.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3Transform.h"
 #include "AliL3TrackArray.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // Hough Inter merger
 // Merging of multiple reconstructed tracks
index 0e1033f..a65fca7 100644 (file)
@@ -5,15 +5,18 @@
 #pragma link off all functions;
 
 #pragma link C++ class AliL3Hough; 
-#pragma link C++ class AliL3HoughTransformer; 
-#pragma link C++ class AliL3HoughTransformerVhdl; 
 #pragma link C++ class AliL3HoughBaseTransformer; 
-#pragma link C++ class AliL3HoughTrack; 
+#pragma link C++ class AliL3HoughTransformer;
+#pragma link C++ class AliL3HoughTransformerLUT;
+//#pragma link C++ class AliL3HoughClusterTransformer.cxx
+#pragma link C++ class AliL3HoughTransformerVhdl;
+#pragma link C++ class AliL3HoughTrack;
 #pragma link C++ class AliL3HoughMaxFinder;
 #pragma link C++ class AliL3HoughEval;
-#pragma link C++ class AliL3HoughMerger;
 #pragma link C++ class AliL3Histogram;
 #pragma link C++ class AliL3Histogram1D;
+//#pragma link C++ class AliL3HistogramAdaptive.cxx
+#pragma link C++ class AliL3HoughMerger;
 #pragma link C++ class AliL3HoughIntMerger;
 #pragma link C++ class AliL3HoughGlobalMerger;
 #pragma link C++ class AliL3HoughDisplay;
index ffcc530..d66fa98 100644 (file)
@@ -3,18 +3,22 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include "AliL3StandardIncludes.h"
+
 #ifndef no_root
 #include <TNtuple.h>
 #include <TFile.h>
 #endif
 
+#include "AliL3Logging.h"
+#include "AliL3HoughMaxFinder.h"
 #include "AliL3Histogram.h"
 #include "AliL3TrackArray.h"
 #include "AliL3HoughTrack.h"
-#include "AliL3HoughMaxFinder.h"
+
+#if GCCVERSION == 3
+using namespace std;
+#endif
 
 //_____________________________________________________________
 // AliL3HoughMaxFinder
@@ -852,7 +856,7 @@ void AliL3HoughMaxFinder::FindPeak(Int_t t1,Double_t t2,Int_t t3)
       m_up[i]=0;
     }
 
-  Int_t max_x=0,sum=0,max_xbin=0,bin;
+  Int_t max_x=0,sum=0,max_xbin=0,bin=0;
 
   for(Int_t xbin=xmin; xbin<=xmax; xbin++)
     {
index 8cdbbc8..9ef117b 100644 (file)
@@ -2,7 +2,6 @@
 #define ALIL3_HOUGH_MaxFinder
 
 #include "AliL3RootTypes.h"
-#include <stream.h>
 
 class AliL3Histogram;
 class AliL3TrackArray;
@@ -77,7 +76,7 @@ inline Float_t AliL3HoughMaxFinder::GetXPeak(Int_t i)
 {
   if(i<0 || i>fNMax)
     {
-      cerr<<"AliL3HoughMaxFinder::GetXPeak : Invalid index "<<i<<endl;
+      STDCERR<<"AliL3HoughMaxFinder::GetXPeak : Invalid index "<<i<<STDENDL;
       return 0;
     }
   return fXPeaks[i];
@@ -87,7 +86,7 @@ inline Float_t AliL3HoughMaxFinder::GetYPeak(Int_t i)
 {
   if(i<0 || i>fNMax)
     {
-      cerr<<"AliL3HoughMaxFinder::GetYPeak : Invalid index "<<i<<endl;
+      STDCERR<<"AliL3HoughMaxFinder::GetYPeak : Invalid index "<<i<<STDENDL;
       return 0;
     }
   return fYPeaks[i];
@@ -98,7 +97,7 @@ inline Int_t AliL3HoughMaxFinder::GetWeight(Int_t i)
 {
   if(i<0 || i>fNMax)
     {
-      cerr<<"AliL3HoughMaxFinder::GetWeight : Invalid index "<<i<<endl;
+      STDCERR<<"AliL3HoughMaxFinder::GetWeight : Invalid index "<<i<<STDENDL;
       return 0;
     }
   return fWeight[i];
index 451d659..ce8dfd6 100644 (file)
@@ -1,8 +1,8 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <math.h>
-#include <stdlib.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3Transform.h"
 #include "AliL3TrackArray.h"
 #include "AliL3HoughMerger.h"
 #include "AliL3HoughTransformer.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3HoughMerger
 //
index 2978901..3a45669 100644 (file)
@@ -3,12 +3,16 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <math.h>
+#include "AliL3StandardIncludes.h"
 
 #include "AliL3Logging.h"
 #include "AliL3HoughTrack.h"
 #include "AliL3Transform.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3HoughTrack
 //
@@ -114,7 +118,7 @@ void AliL3HoughTrack::UpdateToFirstRow()
     Double_t y0    = GetR0() * sin(GetPhi0()) ;
   */
   Double_t rc    = GetRadius();//fabs(GetPt()) / ( BFACT * AliL3Transform::GetBField() )  ;
-  Double_t tPhi0 = GetPsi() + GetCharge() * 0.5 * pi / fabs(GetCharge()) ;
+  Double_t tPhi0 = GetPsi() + GetCharge() * 0.5 * pi / abs(GetCharge()) ;
   Double_t xc    = GetCenterX();//x0 - rc * cos(tPhi0) ;
   Double_t yc    = GetCenterY();//y0 - rc * sin(tPhi0) ;
   
@@ -148,7 +152,7 @@ void AliL3HoughTrack::UpdateToFirstRow()
   
   //if ( tPhi < 0 ) tPhi += 2. * M_PI ;
   
-  Double_t tPsi = tPhi - GetCharge() * 0.5 * pi / fabs(GetCharge()) ;
+  Double_t tPsi = tPhi - GetCharge() * 0.5 * pi / abs(GetCharge()) ;
   if ( tPsi > 2. * pi ) tPsi -= 2. * pi ;
   if ( tPsi < 0.        ) tPsi += 2. * pi ;
   
index aebd5a1..dc2c829 100644 (file)
@@ -3,13 +3,19 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include "AliL3MemHandler.h"
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3HoughTransformer.h"
+#include "AliL3MemHandler.h"
 #include "AliL3Transform.h"
 #include "AliL3DigitData.h"
 #include "AliL3HistogramAdaptive.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3HoughTransformer
 //
index ba1bfbf..1f342a8 100644 (file)
@@ -15,6 +15,7 @@ class AliL3HoughTransformer : public AliL3HoughBaseTransformer {
   TrackIndex **fTrackID; //!
 #endif
   Bool_t fDoMC;
+
   void DeleteHistograms();
 
  public:
index 39c94c3..27ba92a 100644 (file)
@@ -47,10 +47,11 @@ else
 INCLUDES += -I/prog/alice/level3/kip/MLUC/include
 endif
 
-SRCS = AliL3HoughTransformer.cxx AliL3HoughTrack.cxx \
+SRCS = AliL3HoughTransformer.cxx AliL3HoughTrack.cxx AliL3HoughClusterTransformer.cxx \
        AliL3HoughEval.cxx AliL3HoughMerger.cxx AliL3HoughBaseTransformer.cxx \
        AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx AliL3HoughTransformerVhdl.cxx \
-       AliL3Histogram.cxx AliL3Histogram1D.cxx AliL3HoughMaxFinder.cxx AliL3Hough.cxx
+       AliL3Histogram.cxx AliL3Histogram1D.cxx AliL3HoughMaxFinder.cxx AliL3Hough.cxx \
+       AliL3HoughTransformerLUT.cxx 
 
 DICT  = AliL3HoughCint-$(USEPACKAGE).cxx
 DICTH = AliL3HoughCint-$(USEPACKAGE).h
@@ -73,7 +74,6 @@ HDRS = $(SRCS:.cxx=.h)
 OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS))
 endif
 
-
 LEVELSO = $(LIBDIR)/libAliL3Hough.so
 
 all : $(OBJDIR) $(LIBDIR) $(LEVELSO)
@@ -83,7 +83,7 @@ $(LEVELSO) : $(OBJS)
 
 $(DICT) : $(HDRS)
        @echo "Generating dictionary..."
-       @rootcint -f $(DICT) -c $(INCLUDES) $(HDRS)
+       @rootcint -f $(DICT) -c $(INCLUDES) -DGCCVERSION=$(GCCVERSION) -include AliL3StandardIncludes.h $(HDRS)
 
 $(OBJDIR)/%.o : %.cxx 
        $(CXX) $(CXXFLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<