Little bugfix vor aliversion 3.08.

diff --git a/HLT/programs/Makefile b/HLT/programs/Makefile
index c14e534d7c90249c2a0647e175e33cd334719db4..f786559b9fef29fd8e7b2f9126315748aae077e8 100644 (file)
--- a/HLT/programs/Makefile
+++ b/HLT/programs/Makefile
@@ -29,11 +29,11 @@ endif
 
 ifeq ($(USEPACKAGE),ALIROOT)
 DEFSTR = -Duse_aliroot -Duse_root
-ALICELIBS = -L$(ALICE_ROOT)/lib/tgt_Linux -lCONTAINERS -lTPC -lSTEER
+ALICELIBS = -L$(ALICE_ROOT)/lib/tgt_Linux -lTPC -lCONTAINERS -lSTEER
 #ALICELIBS := $(shell aliroot-config --libs)
 INCLUDES += -I$(ROOTSYS)/include -I$(ALICE_ROOT)/include/ -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/CONTAINERS -I$(ALICE_ROOT)/STEER
 RLIBS = $(ROOTLIBS) -lMinuit -lEG
-LIBS += $(ALICELIBS)
+LIBS += $(ALICELIBS) $(RLIBS)
 endif
 
 ifdef DO_MC
@@ -59,7 +59,7 @@ DEFSTR += $(EXTRADEF)
 CXXFLAGS = -O2 -Wall -ggdb $(EXTRACXXFLAGS) $(INCLUDES)
 LDFLAGS  = -O2 $(EXTRALDFLAGS) $(LIBS)
 
-PRGS   = runit read  runvhdlcf runhough
+PRGS   = runit read  runvhdlcf runhough runvhdlhough
 UTILS   = convbin speedtest gettransform
 
 
@@ -77,13 +77,13 @@ runvhdlcf : runvhdlcf.o
 runit : runit.o
        $(LD) $< $(LDFLAGS) -o $@
 
-convbin : ali2raw.o
-       $(LD) $< $(LDFLAGS) -o $@
-
 #read l3 raw data, print it and convert to altro data
 read : read.o
        $(LD) $< $(LDFLAGS) -o $@
 
+convbin : ali2raw.o
+       $(LD) $< $(LDFLAGS) -o $@
+
 gettransform : gettransform.o
        $(LD) $< $(LDFLAGS) -o $@
 
@@ -93,7 +93,7 @@ speedtest : speedtest.cxx
        # cxx -O -Wall -fPIC  -lm  $(CXXFLAGS) speedtest.cxx -o speedtest 
 
 %.o : %.cxx 
-       $(CXX) $(CXXFLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<
+       $(CXX) $(CXXFLAGS) $(CXXGCC3FLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<
 
 clean :
        rm -f *.o $(PRGS) $(UTILS)

diff --git a/HLT/programs/runhough.cxx b/HLT/programs/runhough.cxx
index fbce379b44b25fa726c76adfde0eb9995adef0c8..707fb297e63f87271f7b83fde770ea8dd5453643 100644 (file)
--- a/HLT/programs/runhough.cxx
+++ b/HLT/programs/runhough.cxx
@@ -2,10 +2,11 @@
 
 // Author: Constantin Loizides <mailto: loizides@ikf.physik.uni-frankfurt.de
 
-#include <stream.h>
-#include <libgen.h>
+#include <AliL3StandardIncludes.h>
 
 #include <AliL3RootTypes.h>
+#include <AliL3Logging.h>
+#include <AliL3Logger.h>
 #include <AliL3Transform.h>
 #include <AliL3Track.h>
 #include <AliL3TrackArray.h>
@@ -13,14 +14,13 @@
 #include <AliL3ClustFinderNew.h>
 #include <AliL3MemHandler.h>
 #include <AliL3SpacePointData.h>
-#include <AliL3Logging.h>
-#include <AliL3Logger.h>
 #include <AliL3HoughBaseTransformer.h>
-#include <AliL3HoughTransformerVhdl.h>
 #include <AliL3HoughTransformer.h>
-#include <AliL3Hough.h>
-//#include <AliL3FFloat.h>
+#include <AliL3HoughTransformerLUT.h>
+#include <AliL3HoughTransformerVhdl.h>
 #include <AliL3HoughMaxFinder.h>
+//#include <AliL3FFloat.h>
+#include <AliL3Hough.h>
 #ifndef no_root
 #include <TROOT.h>
 #include <TApplication.h>
@@ -30,6 +30,9 @@
 #include <TGraphErrors.h>
 #endif
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
 
 int main(int argc,char **argv)
 {
@@ -64,26 +67,16 @@ int main(int argc,char **argv)
 
 #if 0
   runhough(sl,sh,path,segs);
-#else
-  //VESTBO: Look here, init of six trafos
-  AliL3HoughBaseTransformer **fHoughTransformer = new AliL3HoughBaseTransformer*[6];
+#else //do some comparison tests
 
-  for(int i=0;i<6;i++){
-    cout << "----------------------------- " << i << "----------------------------- " << endl;
+  AliL3HoughBaseTransformer *fh1 = new AliL3HoughTransformerVhdl(0,0,segs);
+  AliL3HoughBaseTransformer *fh2 = new AliL3HoughTransformerLUT(0,0,segs);
 
-    //VESTBO: init one of them
-    fHoughTransformer[i] = new AliL3HoughTransformerVhdl(0,i,segs);
-    //VESTBO: Print parameters
-    fHoughTransformer[i]->Print();
+  fh1->CreateHistograms(64,0.1,64,-30,30);
+  fh2->CreateHistograms(64,0.1,64,-30,30);
 
-    //VESTBO: Play around with combinations of creating histos or/and init values.
-    fHoughTransformer[i]->CreateHistograms(64,0.1,64,-30,30);
-    //fHoughTransformer[i]->Init(sl,i,segs);
+  fh1->Print();
 
-    //VESTBO: Print parameters. Error should happen here: crash or be in endless loop, that means 
-    //somehow data members get overwritten!!
-    fHoughTransformer[i]->Print();
-  }
 #endif
 
   //AliL3FFloat::PrintStat();

diff --git a/HLT/programs/runit.cxx b/HLT/programs/runit.cxx
index 39ba12d3ce27ff4f6ff5df8a75e34d0baf2f3b61..c3e99f4bdf946993319249d326ef1dace8b090d7 100644 (file)
--- a/HLT/programs/runit.cxx
+++ b/HLT/programs/runit.cxx
@@ -19,7 +19,7 @@
 /**
  Example program how to run the "standalone" clusterfinder.
 
- Import: give patch=-1 for one-patch slices.
+ Important: give patch=-1 for one-patch slices.
 */
 
 int main(int argc,char **argv)