Little changes to make g++ version 3.2 compile the comp library.
authorloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 25 Aug 2002 16:43:31 +0000 (16:43 +0000)
committerloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 25 Aug 2002 16:43:31 +0000 (16:43 +0000)
HLT/comp/AliL3Compress.cxx
HLT/comp/AliL3ModelTrack.cxx
HLT/comp/AliL3Modeller.cxx
HLT/comp/Makefile

index a4b35efbe0205d52770b5e94af9df18989b15340..325ec9b883da10f3b80270dc6ece485dfc00a601 100644 (file)
@@ -3,13 +3,12 @@
 // Author: Anders Vestbo <mailto:vestbo$fi.uib.no>
 //*-- Copyright &copy ASV
 
-#include <stdio.h>
-#include <stream.h>
-#include <stdlib.h>
+#include "AliL3StandardIncludes.h"
 #include <TH1.h>
 #include <TH2.h>
 #include <TRandom.h>
 
+#include "AliL3Logging.h"
 #include "AliL3Compress.h"
 #include "AliL3TrackArray.h"
 #include "AliL3ModelTrack.h"
@@ -385,7 +384,7 @@ void AliL3Compress::CreateDigitArray(Int_t maxnumber)
   fDPt = new AliL3RandomDigitData*[maxnumber];
 }
 
-void AliL3Compress::RestoreData(Char_t which='u')
+void AliL3Compress::RestoreData(Char_t which)
 {
   //Restore the data.
   //which == u : restore compressed data
@@ -419,7 +418,7 @@ void AliL3Compress::RestoreData(Char_t which='u')
   QSort(fDPt,0,fNDigits);
 }
 
-void AliL3Compress::PrintDigits(Int_t padrow=-1)
+void AliL3Compress::PrintDigits(Int_t padrow)
 {
   Int_t pad,time,charge,row;
   for(Int_t i=0; i<fNDigits; i++)
index f92813d9c3d580f88d44def974660b93d9f737e7..1430f69efc57e442d12264cffa1c7577a56fc08a 100644 (file)
@@ -3,14 +3,16 @@
 // Author: Anders Vestbo <mailto:vestbo$fi.uib.no>
 //*-- Copyright &copy ASV
 
-#include <stream.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include "AliL3StandardIncludes.h"
 
+#include "AliL3Logging.h"
 #include "AliL3ModelTrack.h"
 #include "AliL3Transform.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3ModelTrack
 //
@@ -106,7 +108,7 @@ void AliL3ModelTrack::SetCluster(Int_t row,Float_t fpad,Float_t ftime,Float_t ch
   fNClusters++;
 }
 
-Int_t AliL3ModelTrack::CheckClustersQuality(UInt_t npads=3)
+Int_t AliL3ModelTrack::CheckClustersQuality(UInt_t npads)
 {
 
   //Check the quality of clusters,- remove clusters with less than
@@ -460,7 +462,7 @@ Double_t AliL3ModelTrack::GetParSigmaZ2(Int_t row)
   
 }
 
-void AliL3ModelTrack::AssignTrackID(Float_t wrong=0.10)
+void AliL3ModelTrack::AssignTrackID(Float_t wrong)
 {
   //Assign a track ID to the track, corresponding to the MC TParticle ID.
   //Can only be done if you compiled with do_mc flag, of course.
index 5e1967149dbb49f804233ae1224ab1cd19519795..4f2a8472204e827a240108d80e2a67111efe4d45 100644 (file)
@@ -3,9 +3,7 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV
 
-#include <stream.h>
-#include <iostream.h>
-#include <math.h>
+#include "AliL3StandardIncludes.h"
 
 #include "AliL3Modeller.h"
 #include "AliL3MemHandler.h"
 #include "AliL3DigitData.h"
 #include "AliL3Transform.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 //_____________________________________________________________
 // AliL3Modeller
 //
@@ -48,7 +50,7 @@ AliL3Modeller::~AliL3Modeller()
     delete fTracks;
 }
 
-void AliL3Modeller::Init(Int_t slice,Int_t patch,Char_t *trackdata,Char_t *path,Bool_t houghtracks,Bool_t binary=kTRUE)
+void AliL3Modeller::Init(Int_t slice,Int_t patch,Char_t *trackdata,Char_t *path,Bool_t houghtracks,Bool_t binary)
 {
   fSlice = slice;
   fPatch = patch;
index 358891457ddd9cc849887847d3adde4250aa4869..88c43d7071245801ca32e7a9d10a2f86627e4fce 100644 (file)
@@ -78,7 +78,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 $@ $<