Little changes to make g++ version 3.2 compile the src library. Problems remaining...
authorloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 25 Aug 2002 16:30:18 +0000 (16:30 +0000)
committerloizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 25 Aug 2002 16:30:18 +0000 (16:30 +0000)
27 files changed:
HLT/src/AliL3Benchmark.cxx
HLT/src/AliL3Benchmark.h
HLT/src/AliL3ClustFinderNew.cxx
HLT/src/AliL3ConfMapFit.cxx
HLT/src/AliL3ConfMapPoint.cxx
HLT/src/AliL3ConfMapTrack.cxx
HLT/src/AliL3ConfMapper.cxx
HLT/src/AliL3Display.cxx
HLT/src/AliL3Evaluate.cxx
HLT/src/AliL3FileHandler.cxx
HLT/src/AliL3GlobalMerger.cxx
HLT/src/AliL3InterMerger.cxx
HLT/src/AliL3Logger.cxx
HLT/src/AliL3Logger.h
HLT/src/AliL3Logging.h
HLT/src/AliL3MemHandler.cxx
HLT/src/AliL3Merger.cxx
HLT/src/AliL3RootTypes.h
HLT/src/AliL3Track.cxx
HLT/src/AliL3TrackArray.cxx
HLT/src/AliL3TrackMerger.cxx
HLT/src/AliL3TrackSegmentData.h
HLT/src/AliL3Transform.cxx
HLT/src/AliL3Vertex.cxx
HLT/src/AliL3VertexArray.cxx
HLT/src/AliL3VertexFinder.cxx
HLT/src/AliLevel3.cxx

index 2d5b81b4ed0cc6d126911c8fce36ad6a752de225..b0fecc78ef40a66a2efe8dc0550c126eefaf0f59 100644 (file)
@@ -1,7 +1,8 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli
 
-#include <time.h>
+#include "AliL3StandardIncludes.h"
+
 #ifndef no_root
 #include <TFile.h>
 #include <TGraphAsymmErrors.h>
@@ -10,9 +11,8 @@
 #include <TMath.h>
 #endif
 
-#include "AliL3Benchmark.h"
 #include "AliL3Logging.h"
-
+#include "AliL3Benchmark.h"
 
 /**
 // \class AliL3Benchmark
index 83003370dd8c2a4beb4b13448bd4ef34a2ed14ea..28bdb1dd76b0e9edf87db59c6c697ff2783b7364 100644 (file)
@@ -6,7 +6,6 @@
 class TStopwatch;
 class TString;
 #else
-#include <string.h>
 #include "AliL3RootTypes.h"
 #include "AliL3Stopwatch.h"
 #endif
index eeb96265cb69fb59ebf30f3b9a16f12b03d361c6..c8cfc3cbbcd1a2228572a1457340667a8fdcb111 100644 (file)
@@ -3,8 +3,9 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <iostream.h>
-#include <math.h>
+
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3ClustFinderNew.h"
 #include "AliL3DigitData.h"
 #include "AliL3SpacePointData.h"
 #include "AliL3MemHandler.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
+
 /** \class AliL3ClustFinderNew
 //<pre>
 //_____________________________________________________________
index 38b4d285365332d63539ae3e6482f9100e26529f..7c31226a5e7a3f697b91da5476049219e99e6234 100644 (file)
@@ -3,7 +3,7 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <math.h>
+#include "AliL3StandardIncludes.h"
 
 #include "AliL3Logging.h"
 #include "AliL3ConfMapFit.h"
index a2a1ff3fa0718c7fbed940e765b4fa531bde00bf..21c9dd4f1e8e2f8d3a42f54a587294087a2e2e93 100644 (file)
@@ -1,10 +1,9 @@
 // Author: Anders Vestbo <mailto:vestbo$fi.uib.no>
 //*-- Copyright &copy ASV
 
-#include <iostream.h>
-#include <math.h>
-#include "AliL3Logging.h"
+#include "AliL3StandardIncludes.h"
 
+#include "AliL3Logging.h"
 #include "AliL3ConfMapPoint.h"
 #include "AliL3SpacePointData.h"
 #include "AliL3Vertex.h"
index 793cde2ab1370a3bbbd9d5d0317f6083b9507972..cd538a6e3ee1fe00cde5843a46d4931235e71761 100644 (file)
@@ -3,6 +3,8 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ASV 
 
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3RootTypes.h"
 #include "AliL3Logging.h"
 #include "AliL3Vertex.h"
@@ -10,7 +12,6 @@
 #include "AliL3ConfMapFit.h"
 #include "AliL3ConfMapTrack.h"
 #include "AliL3Transform.h"
-#include <math.h>
 
 //_____________________________________________________________
 // AliL3ConfMapTrack
@@ -197,7 +198,7 @@ void AliL3ConfMapTrack::UpdateToFirstPoint()
   
   //Get the track parameters
   
-  Double_t tPhi0 = GetPsi() + GetCharge() * 0.5 * pi / fabs(GetCharge()) ;
+  Double_t tPhi0 = GetPsi() + GetCharge() * 0.5 * pi / abs(GetCharge()) ;
   Double_t x0    = GetR0() * cos(GetPhi0()) ;
   Double_t y0    = GetR0() * sin(GetPhi0()) ;
   Double_t rc    = fabs(GetPt()) / ( BFACT * AliL3Transform::GetBField() )  ;
@@ -237,7 +238,7 @@ void AliL3ConfMapTrack::UpdateToFirstPoint()
   
   //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 53ac9eacb7a779ad1e1d56af4779a8365ed9092e..f2fcdbc0a649bcc6df36cbb4b3c2a987f659a53e 100644 (file)
@@ -3,12 +3,10 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
  
-#include <iostream.h>
-#include <time.h>
-#include <math.h>
+#include "AliL3StandardIncludes.h"
 #include <sys/time.h>
-#include "AliL3ConfMapper.h"
 
+#include "AliL3ConfMapper.h"
 #include "AliL3Logging.h" 
 #include "AliL3Vertex.h"
 #include "AliL3ConfMapTrack.h"
@@ -745,7 +743,7 @@ Double_t AliL3ConfMapper::CalcDistance(const AliL3ConfMapPoint *hit1,const AliL3
   Double_t phi_diff = fabs( hit1->GetPhi() - hit2->GetPhi() );
   if (phi_diff > pi) phi_diff = twopi - phi_diff;
   
-  return todeg*fabs(hit1->GetPadRow() - hit2->GetPadRow()) * (phi_diff + fabs( hit1->GetEta() - hit2->GetEta() ));
+  return todeg*fabs((Float_t)((hit1->GetPadRow() - hit2->GetPadRow()) * (phi_diff + fabs( hit1->GetEta() - hit2->GetEta()))));
 }
 
 Bool_t AliL3ConfMapper::VerifyRange(const AliL3ConfMapPoint *hit1,const AliL3ConfMapPoint *hit2) const
index 9e65235777c29cd7a5ae6c2cddac1e83664dc33a..b071dd218bb600fff144bdef57bd1472515ad9f1 100644 (file)
@@ -3,6 +3,7 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
+#include "AliL3StandardIncludes.h"
 #include <TCanvas.h>
 #include <TView.h>
 #include <TPolyMarker3D.h>
@@ -15,6 +16,7 @@
 #include <TParticle.h>
 #include <TFile.h>
 
+#include "AliL3Logging.h"
 #include "AliL3Display.h"
 #ifdef use_aliroot
 #include "AliRun.h"
 #include "AliL3TrackArray.h"
 #include "AliL3SpacePointData.h"
 #include "AliL3MemHandler.h"
-#include "AliL3Logging.h"
 
+#if GCCVERSION == 3
+using namespace std;
+#endif
 
 //_____________________________________________________________
 // AliL3Display
index 3a4c4f78e055df7aa3a041358b01325f544f5372..21f7a23d196b7cb47f372ab587f46ddfa1cb4dc8 100644 (file)
@@ -3,9 +3,7 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 //*-- Copyright &copy ASV 
 
-#include <stdio.h>
-#include <math.h>
-#include <fstream.h>
+#include "AliL3StandardIncludes.h"
 #include <TFile.h>
 #include <TH1.h>
 #include <TParticle.h>
 #include <AliTPCParam.h>
 #include <AliComplexCluster.h>
 
+#if GCCVERSION == 3
+#include <fstream>
+#include <iosfwd>
+#else
+#include <fstream.h>
+#endif
+
+#include "AliL3Logging.h"
 #include "AliL3Transform.h"
 #include "AliL3SpacePointData.h"
 #include "AliL3Track.h"
 #include "AliL3FileHandler.h"
 #include "AliL3TrackArray.h"
 #include "AliL3Evaluate.h"
-#include "AliL3Logging.h"
+
+#if GCCVERSION == 3
+using namespace std;
+#endif
 
 //_____________________________________________________________
 // AliL3Evaluate
index c54ce76237842febf78208442d9358547b761654..3a8a698b9f1a988851edad471e0bf7cd442a5046 100644 (file)
@@ -3,19 +3,17 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>, Anders Vestbo <mailto:vestbo$fi.uib.no>
 //*-- Copyright &copy Uli 
 
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+#include <AliTPCDigitsArray.h>
+#include <AliTPCClustersArray.h>
+#include <AliTPCcluster.h>
+#include <AliTPCClustersRow.h>
 
-#include "AliL3Transform.h"
 #include "AliL3Logging.h"
+#include "AliL3Transform.h"
 #include "AliL3MemHandler.h"
 #include "AliL3FileHandler.h"
 
-#include "AliTPCDigitsArray.h"
-#include "AliTPCClustersArray.h"
-#include "AliTPCcluster.h"
-#include "AliTPCClustersRow.h"
-
 #include "AliL3DigitData.h"
 #include "AliL3TrackSegmentData.h"
 #include "AliL3SpacePointData.h"
index 005d3fbc110183fb7efe53dadb55f7582c83637c..e97dc608be94f86d503a008cf3403948589de7cd 100644 (file)
@@ -3,8 +3,8 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli 
 
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3GlobalMerger.h"
 #include "AliL3Track.h"
index 7beef83092cd6604383de5e36008db23e72992e3..5e6ebdb7f396fd093ffdfe44fbfc00abbe2db428 100644 (file)
@@ -1,8 +1,8 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli 
 
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3InterMerger.h"
 #include "AliL3Track.h"
index f8c261d55c1dbd116f023f0c55f1d6aec86e8a5d..c0318a055197b04e5e25150f7a6e6e8539595d6f 100644 (file)
@@ -3,10 +3,10 @@
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
 // changes done by Constantin Loizides <mailto:loizides@ikf.physik.uni-frankfurt.de>
 
+#include "AliL3StandardIncludes.h"
 
 #include "AliL3Logging.h"
 #include "AliL3Logger.h"
-#include <fstream.h>
 
 ClassImp(AliL3Logger)
 
index 5a56d1a408ee8ac871df0d512ddb85a2849621ce..5b46986377eb0c428633731ed366c7dfbf31eb64 100644 (file)
@@ -3,6 +3,13 @@
 
 #include "AliL3RootTypes.h"
 
+#if GCCVERSION == 3
+#include <fstream>
+#include <iosfwd>
+#else
+#include <fstream.h>
+#endif
+
 class MLUCLogServer;
 class ofstream;
 
@@ -31,7 +38,11 @@ class AliL3Logger{
   MLUCLogServer *so; //!
   MLUCLogServer *se; //!
   MLUCLogServer *sm; //!
-  ofstream *of;      //!
+#if GCCVERSION == 3
+  std::ofstream *of; //!
+#else  
+  ofstream *of; //!
+#endif
 
   ClassDef(AliL3Logger,1)
 };
index 1f08bd79a54952d542cf6eb73167cc11967297c6..5530918c81fa97cc1c9b05d87e81ccfcd56e7153 100644 (file)
@@ -14,16 +14,20 @@ typedef MLUCStderrLogServer AliL3StderrLogServer;
 typedef MLUCStreamLogServer AliL3StreamLogServer;
 
 #else
-#include <iostream.h>
+
 class AliL3Log{
   public:
   enum TLogLevel { kNone = 0, kDebug= 0x01, kInformational = 0x02, kWarning = 0x04, kError = 0x08 , kFatal = 0x10, kPrimary = 0x80, kAll = 0x9F };
   enum TLogCmd { kEnd, kPrec, kHex, kDec };
 };
 
+#if GCCVERSION == 3
+#define LOG( lvl, origin, keyword ) std::cerr<<"["<<origin<<": "<<keyword<<"] "
+#define ENDLOG std::endl
+#else
 #define LOG( lvl, origin, keyword ) cerr<<"["<<origin<<": "<<keyword<<"] "
-
 #define ENDLOG endl
+#endif
 
 #endif
 #endif // ALIL3LOGGING_H
index 14edb0a1d229277cf7ddfb8213952f1f18ed136e..bf477b7a538538cf16fd34835a6cb85dd960780c 100644 (file)
@@ -4,12 +4,7 @@
 //*-- Copyright &copy Uli 
 // changes done by Constantin Loizides <mailto:loizides@ikf.physik.uni-frankfurt.de>
 
-
-#include <math.h>
-#include <time.h>
-#include <iostream.h>
-#include <stdio.h>
-#include <string.h>
+#include "AliL3StandardIncludes.h"
 
 #include "AliL3Logging.h"
 #include "AliL3Transform.h"
index 2c5f5e750ef25f179ee1c7f011d9c9237d4beae9..76af24c7ce24013d132493e2d411ab9481315712 100644 (file)
@@ -3,9 +3,9 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli 
 
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
-#include <math.h>
-#include <iostream.h>
 #include "AliL3Merger.h"
 #include "AliL3Track.h"
 #include "AliL3TrackSegmentData.h"
index 364f56812e1f79da9f565eca1365b07823193887..5ab257e6b2c92b17ed8bca37fae1afb180061763 100644 (file)
@@ -7,8 +7,6 @@
 // Basic types used by level3                                           //
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
-#include <stdio.h>
-#include <math.h>
 
 #ifndef no_root
 #include <TObject.h>
 
 #else
 
+#if GCCVERSION == 3
+#include <cstdio>
+#include <cmath>
+#else
+#include <stdio.h>
+#include <math.h>
+#endif
+
 #ifndef ROOT_Rtypes
 //---- types -------------------------------------------------------------------
 
@@ -53,7 +59,6 @@ typedef void         (*VoidFuncPtr_t)();  //pointer to void function
 
 
 //---- constants ---------------------------------------------------------------
-
 #ifndef NULL
 #define NULL 0
 #endif
@@ -69,12 +74,9 @@ const Ssiz_t kNPOS        = ~(Ssiz_t)0;
 
 //---- ClassDef macros ---------------------------------------------------------
 
-
 #define ClassDef(name,id) 
-
 #define ClassImp(name) 
 #endif  //end of Rtypes 
-
 #endif  //end of root selection
 
 //---- Timms AliL3EventDataType  from AliL3EventDataType.h
index 8d286e786b623eb210d688307d12c33e1364b392..3c7a9900e72eb41b06e85e9137a624e7b7aada52 100644 (file)
@@ -3,14 +3,14 @@
 // Author: Anders Vestbo <mailto:vestbo$fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ASV
 
+#include "AliL3StandardIncludes.h"
 
 #include "AliL3RootTypes.h"
-
 #include "AliL3Logging.h"
 #include "AliL3Track.h"
 #include "AliL3Transform.h"
 #include "AliL3Vertex.h"
-#include <math.h>
+
 
 //_____________________________________________________________
 // AliL3Track
index a46729263a573535ca4b849fd39760af70d221e1..7911f891205566b43f469faa505d9f325bc9fc76 100644 (file)
@@ -3,9 +3,8 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ULI
 
-#include <math.h>
-#include <string.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3TrackArray.h"
 #include "AliL3HoughTrack.h"
index 6509ed23b7449555e28f927323656986be06bcbf..8ae89fc094151b0dd76ec5d06b6ef19575825373 100644 (file)
@@ -1,8 +1,8 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ULI
 
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3TrackMerger.h"
 #include "AliL3Track.h"
index ba1ffad2d8ca8854445b788973b3ea314038e7d1..8cf3415f72bb1e36f7e4981f60225153678d1640 100644 (file)
@@ -21,7 +21,4 @@ struct AliL3TrackSegmentData
 
 typedef struct AliL3TrackSegmentData AliL3TrackSegmentData;
 
-
-
-
 #endif /* _ALIL3TRACKSEGMENTDATA_H_ */
index 03ee92a0a56b115fbd6e6c0fca84391c092f3363..c2b2f48e44e8a6f5ade026af6b3589416f4bb7db 100644 (file)
@@ -4,11 +4,11 @@
 //*-- Copyright &copy ASV
 // changes done by Constantin Loizides <mailto:loizides@ikf.physik.uni-frankfurt.de>
 
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3Transform.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+
 
 /** \class AliL3Transform 
 //<pre>
@@ -246,7 +246,7 @@ Double_t AliL3Transform::fX[176] = {84.570007324218750,
                                     243.054992675781250,
                                     244.054992675781250,
                                     245.054992675781250,
-                                    246.054992675781250,
+                                    246.054992675781250
 };
 
 Int_t AliL3Transform::fNPads[176] = {67,
@@ -424,7 +424,7 @@ Int_t AliL3Transform::fNPads[176] = {67,
                                      137,
                                      137,
                                      139,
-                                     139,
+                                     139
 };
 
 
@@ -497,7 +497,6 @@ void AliL3Transform::Init(const Char_t* path)
   fclose(fptr);
   delete pathname;
   fVersion=1; //new version
-
 }
 
 Double_t AliL3Transform::GetEta(Float_t *xyz)
index 72c020c143e5353f662e8cd0f3270e23d062ba8f..7f1984b67aea9154039c8a77b8789bcf126d1d8d 100644 (file)
@@ -1,8 +1,9 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli
 
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3RootTypes.h"
-#include <iostream.h>
 #include "AliL3Logging.h"
 #include "AliL3Vertex.h"
 
index aaca19293f3b971baaf08556accca0aa7696b08b..4e57de3b44203001c6da4a1515209d5c5caba189 100644 (file)
@@ -1,9 +1,9 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli
 
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
-//#include <TMath.h>
-#include <iostream.h>
 #include "AliL3VertexArray.h"
 
 
index 01635e7a55aba5a8d8ec043af86b2dbaa8c43927..70cd3591215f92afab452b135198d25a566a4ee8 100644 (file)
@@ -1,7 +1,8 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli
 
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
 #include "AliL3VertexArray.h"
 #include "AliL3Vertex.h"
index 76ae3a167df43556276f6b5cedde89cad52daebe..68f8312635b150a8e57ff3e7ecfc2d985bcc52db 100644 (file)
@@ -3,12 +3,13 @@
 // Author: Anders Vestbo <mailto:vestbo$fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ASV
 
+#include "AliL3StandardIncludes.h"
+
 #ifndef no_root
 #include <TFile.h>
 #include <TDirectory.h>
 #include <TClonesArray.h>
 #include <TStopwatch.h>
-#include <iostream.h>
 #endif
 
 #include "AliL3Logging.h"
@@ -30,7 +31,6 @@
 #include "AliL3FileHandler.h"
 #endif
 #include "AliL3Benchmark.h"
-
 #include "AliL3DigitData.h"
 #include "AliL3TrackSegmentData.h"
 #include "AliL3SpacePointData.h"
@@ -110,7 +110,7 @@ AliLevel3::AliLevel3(TFile *in)
 }
 #endif
 
-void AliLevel3::Init(Char_t *path,Bool_t binary=kTRUE,Int_t npatches=6)
+void AliLevel3::Init(Char_t *path,Bool_t binary,Int_t npatches)
 {
   if(!binary && !fInputFile)
     {