// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © Uli
-#include <time.h>
+#include "AliL3StandardIncludes.h"
+
#ifndef no_root
#include <TFile.h>
#include <TGraphAsymmErrors.h>
#include <TMath.h>
#endif
-#include "AliL3Benchmark.h"
#include "AliL3Logging.h"
-
+#include "AliL3Benchmark.h"
/**
// \class AliL3Benchmark
class TStopwatch;
class TString;
#else
-#include <string.h>
#include "AliL3RootTypes.h"
#include "AliL3Stopwatch.h"
#endif
// Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
//*-- Copyright © 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>
//_____________________________________________________________
// Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
//*-- Copyright © ASV
-#include <math.h>
+#include "AliL3StandardIncludes.h"
#include "AliL3Logging.h"
#include "AliL3ConfMapFit.h"
// Author: Anders Vestbo <mailto:vestbo$fi.uib.no>
//*-- Copyright © 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"
// Author: Anders Vestbo <mailto:vestbo@fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © ASV
+#include "AliL3StandardIncludes.h"
+
#include "AliL3RootTypes.h"
#include "AliL3Logging.h"
#include "AliL3Vertex.h"
#include "AliL3ConfMapFit.h"
#include "AliL3ConfMapTrack.h"
#include "AliL3Transform.h"
-#include <math.h>
//_____________________________________________________________
// AliL3ConfMapTrack
//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() ) ;
//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 ;
// Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
//*-- Copyright © 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"
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
// Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
//*-- Copyright © ASV
+#include "AliL3StandardIncludes.h"
#include <TCanvas.h>
#include <TView.h>
#include <TPolyMarker3D.h>
#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
// Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
//*-- Copyright © 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
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>, Anders Vestbo <mailto:vestbo$fi.uib.no>
//*-- Copyright © 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"
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © Uli
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
#include "AliL3Logging.h"
#include "AliL3GlobalMerger.h"
#include "AliL3Track.h"
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © Uli
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
#include "AliL3Logging.h"
#include "AliL3InterMerger.h"
#include "AliL3Track.h"
// 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)
#include "AliL3RootTypes.h"
+#if GCCVERSION == 3
+#include <fstream>
+#include <iosfwd>
+#else
+#include <fstream.h>
+#endif
+
class MLUCLogServer;
class ofstream;
MLUCLogServer *so; //!
MLUCLogServer *se; //!
MLUCLogServer *sm; //!
- ofstream *of; //!
+#if GCCVERSION == 3
+ std::ofstream *of; //!
+#else
+ ofstream *of; //!
+#endif
ClassDef(AliL3Logger,1)
};
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
//*-- Copyright © 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"
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © Uli
+#include "AliL3StandardIncludes.h"
+
#include "AliL3Logging.h"
-#include <math.h>
-#include <iostream.h>
#include "AliL3Merger.h"
#include "AliL3Track.h"
#include "AliL3TrackSegmentData.h"
// 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 -------------------------------------------------------------------
//---- constants ---------------------------------------------------------------
-
#ifndef NULL
#define NULL 0
#endif
//---- ClassDef macros ---------------------------------------------------------
-
#define ClassDef(name,id)
-
#define ClassImp(name)
#endif //end of Rtypes
-
#endif //end of root selection
//---- Timms AliL3EventDataType from AliL3EventDataType.h
// Author: Anders Vestbo <mailto:vestbo$fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © ASV
+#include "AliL3StandardIncludes.h"
#include "AliL3RootTypes.h"
-
#include "AliL3Logging.h"
#include "AliL3Track.h"
#include "AliL3Transform.h"
#include "AliL3Vertex.h"
-#include <math.h>
+
//_____________________________________________________________
// AliL3Track
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © ULI
-#include <math.h>
-#include <string.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
#include "AliL3Logging.h"
#include "AliL3TrackArray.h"
#include "AliL3HoughTrack.h"
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © ULI
-#include <math.h>
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
#include "AliL3Logging.h"
#include "AliL3TrackMerger.h"
#include "AliL3Track.h"
typedef struct AliL3TrackSegmentData AliL3TrackSegmentData;
-
-
-
#endif /* _ALIL3TRACKSEGMENTDATA_H_ */
//*-- Copyright © 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>
243.054992675781250,
244.054992675781250,
245.054992675781250,
- 246.054992675781250,
+ 246.054992675781250
};
Int_t AliL3Transform::fNPads[176] = {67,
137,
137,
139,
- 139,
+ 139
};
fclose(fptr);
delete pathname;
fVersion=1; //new version
-
}
Double_t AliL3Transform::GetEta(Float_t *xyz)
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © Uli
+#include "AliL3StandardIncludes.h"
+
#include "AliL3RootTypes.h"
-#include <iostream.h>
#include "AliL3Logging.h"
#include "AliL3Vertex.h"
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © Uli
+#include "AliL3StandardIncludes.h"
+
#include "AliL3Logging.h"
-//#include <TMath.h>
-#include <iostream.h>
#include "AliL3VertexArray.h"
// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © Uli
-#include <iostream.h>
+#include "AliL3StandardIncludes.h"
+
#include "AliL3Logging.h"
#include "AliL3VertexArray.h"
#include "AliL3Vertex.h"
// Author: Anders Vestbo <mailto:vestbo$fi.uib.no>, Uli Frankenfeld <mailto:franken@fi.uib.no>
//*-- Copyright © 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"
#include "AliL3FileHandler.h"
#endif
#include "AliL3Benchmark.h"
-
#include "AliL3DigitData.h"
#include "AliL3TrackSegmentData.h"
#include "AliL3SpacePointData.h"
}
#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)
{