compilation errors fixed

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx
index 9e29c09a2531f026ef81ee80c7975c4141aecde9..5b4e4148ef0d75a3b10fc6dcad1919c5cf76aded 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx
@@ -25,7 +25,6 @@
 
 #include "AliHLTTPCCAMath.h"
 #include "TStopwatch.h"
-#include <iostream.h>
 
 //#define DRAW
 

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.h b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.h
index bb4e6d80a1c6f39b9956ee08b2c6043c83793984..b3d3725212269a8626b2a385f38e6ddf9a02b9da 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.h
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.h
@@ -9,7 +9,12 @@
 #define ALIHLTTPCCAGBTRACKER_H
 
 #include "AliHLTTPCCADef.h"
+
+#if defined( HLTCA_STANDALONE )
 #include <iostream.h>
+#else
+#include "Riostream.h"
+#endif
 
 class AliHLTTPCCATracker;
 class AliHLTTPCCAGBTrack;

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGrid.cxx b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGrid.cxx
index aeb886ef33f361dbc5477d0e8da4515ad4efa06f..b03abf9018ae8a22e66d6841902bf5509a86807e 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGrid.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGrid.cxx
@@ -39,7 +39,7 @@ GPUd() void AliHLTTPCCAGrid::Create( Float_t yMin, Float_t yMax, Float_t zMin, F
   fStepZInv =  ( fStepZInv>1.e-4 ) ?kz/fStepZInv :1;
 }
 
-GPUd() void AliHLTTPCCAGrid::Create( Float_t yMin, Float_t yMax, Float_t zMin, Float_t zMax, float_t sy, Float_t sz )
+GPUd() void AliHLTTPCCAGrid::Create( Float_t yMin, Float_t yMax, Float_t zMin, Float_t zMax, Float_t sy, Float_t sz )
 {
   //* Create the grid
   

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.h b/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.h
index c7311b81c55a10e537d0fcced332d673d8dab127..98ff857fdbac5ddbca7614074229b28360d5198e 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.h
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAParam.h
@@ -9,7 +9,12 @@
 #define ALIHLTTPCCAPARAM_H
 
 #include "AliHLTTPCCADef.h"
+
+#if defined( HLTCA_STANDALONE )
 #include <iostream.h>
+#else
+#include "Riostream.h"
+#endif
 
 
 /**

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.cxx b/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.cxx
index 11dee86679354ac6f853a2b16ca32f83cabf5152..eb893b922553eda640f7e78d62e57280af56d0f0 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.cxx
@@ -28,7 +28,6 @@
 
 #include "TMath.h"
 #include "TROOT.h"
-#include "Riostream.h"
 #include "TFile.h"
 #include "TH1.h"
 #include "TH2.h"

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.h b/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.h
index e8aa322e6e7c264b509c20fd13a31784605fb5e1..12c47d2109102d809d73030ec9a54c384f8554b3 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.h
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAPerformance.h
@@ -9,6 +9,7 @@
 #define ALIHLTTPCCAPERFORMANCE_H
 
 #include "AliHLTTPCCADef.h"
+#include "Riostream.h"
 
 class TObject;
 class TParticle;

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCATrackConvertor.cxx b/HLT/TPCLib/tracking-ca/AliHLTTPCCATrackConvertor.cxx
index 0a15d32fa0ebd986ffe3a1139c551bf1ed2ff9bd..3f67852636cfa8529db8655f6c0a03a052bb7859 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCATrackConvertor.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCATrackConvertor.cxx
@@ -56,7 +56,7 @@ void AliHLTTPCCATrackConvertor::GetExtParam( const AliHLTTPCCATrackParam &T1, Al
     cov[10] = -cov[10];
     cov[11] = -cov[11];
   }
-  T2.Set(T1.GetX(),alpha,par,cov);
+  T2.Set( (Double_t) T1.GetX(),alpha,par,cov);
 }
 
 void AliHLTTPCCATrackConvertor::SetExtParam( AliHLTTPCCATrackParam &T1, const AliExternalTrackParam &T2, Double_t Bz )

diff --git a/HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx b/HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx
index 294ae6a521125e83c994a7d6eefb6ef6861e50a3..4c70d1052b40b47580402467620992f88837be5b 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx
+++ b/HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx
@@ -154,7 +154,7 @@ Int_t AliTPCtrackerCA::LoadClusters (TTree * fromTree)
   // load mc tracks
   while( fDoHLTPerformance ){
     if( !gAlice ) break;
-    AliRunLoader *rl = gAlice->GetRunLoader(); 
+    AliRunLoader *rl = AliRunLoader::GetRunLoader();//gAlice->GetRunLoader(); 
     if( !rl ) break;
     rl->LoadKinematics();
     AliStack *stack = rl->Stack();