Corrections needed by gcc 3.2
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 15 Nov 2002 14:54:05 +0000 (14:54 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 15 Nov 2002 14:54:05 +0000 (14:54 +0000)
TPC/AliTPCclustererMI.cxx
TPC/AliTPCtrackerMI.cxx

index 6b7d814abe213740ce797dbb4327f5e76b9efa3b..7dfd2563b0d044f1dca4a5f8418e53d8b903a0cc 100644 (file)
@@ -30,7 +30,7 @@
 #include "AliDigits.h"
 #include "AliSimDigits.h"
 #include "AliTPCParam.h"
-#include <iostream.h>
+#include "Riostream.h"
 #include <TTree.h>
 
 ClassImp(AliTPCclustererMI)
@@ -278,8 +278,8 @@ void AliTPCclustererMI::UnfoldCluster(Int_t * matrix2[7], Float_t recmatrix[5][5
        Float_t xm1 = sum3i[+3];
        Float_t x1  = sum3i[2*dk+3];
        Float_t x2  = sum3i[3*dk+3];    
-       Float_t w11   = TMath::Max(4.*xm1-xm2,0.000001);          
-       Float_t w12   = TMath::Max(4 *x1 -x2,0.);
+       Float_t w11   = TMath::Max((Float_t)(4.*xm1-xm2),(Float_t)0.000001);      
+       Float_t w12   = TMath::Max((Float_t)(4 *x1 -x2),(Float_t)0.);
        ratio = w11/(w11+w12);   
        for (Int_t dl=-1;dl<=1;dl++)
          mratio[dk+1][dl+1] *= ratio;
@@ -311,8 +311,8 @@ void AliTPCclustererMI::UnfoldCluster(Int_t * matrix2[7], Float_t recmatrix[5][5
        Float_t xm1 = sum3j[+3];
        Float_t x1  = sum3j[2*dk+3];
        Float_t x2  = sum3j[3*dk+3];    
-       Float_t w11   = TMath::Max(4.*xm1-xm2,0.000001);          
-       Float_t w12   = TMath::Max(4 *x1 -x2,0.);
+       Float_t w11   = TMath::Max((Float_t)(4.*xm1-xm2),(Float_t)0.000001);      
+       Float_t w12   = TMath::Max((Float_t)(4 *x1 -x2),(Float_t)0.);
        ratio = w11/(w11+w12);   
        for (Int_t dl=-1;dl<=1;dl++)
          mratio[dl+1][dk+1] *= ratio;
@@ -351,10 +351,10 @@ void AliTPCclustererMI::UnfoldCluster(Int_t * matrix2[7], Float_t recmatrix[5][5
            //if we have overlap in direction
            recmatrix[di+2][dj+2] = mratio[di+1][dj+1]* matrix2[3+di][dj];    
            if (TMath::Abs(di)+TMath::Abs(dj)>1){
-             ratio =  TMath::Min(recmatrix[di+2][dj+2]/(matrix2[3+0*di][1*dj]+1),1.);
+             ratio =  TMath::Min((Float_t)(recmatrix[di+2][dj+2]/(matrix2[3+0*di][1*dj]+1)),(Float_t)1.);
              recmatrix[2*di+2][dj+2] = ratio*recmatrix[di+2][dj+2];
              //
-             ratio =  TMath::Min(recmatrix[di+2][dj+2]/(matrix2[3+1*di][0*dj]+1),1.);
+             ratio =  TMath::Min((Float_t)(recmatrix[di+2][dj+2]/(matrix2[3+1*di][0*dj]+1)),(Float_t)1.);
              recmatrix[di+2][2*dj+2] = ratio*recmatrix[di+2][dj+2];
            }
            else{
index 16ac7304c3b095ed53d175d72234b2d018c554a4..1131815f5bd50b99013cd8193c44fadf597b5d8a 100644 (file)
@@ -37,7 +37,7 @@
 #include <TObjArray.h>
 #include <TFile.h>
 #include <TTree.h>
-#include <iostream.h>
+#include "Riostream.h"
 
 #include "AliTPCtrackerMI.h"
 #include "AliTPCclusterMI.h"
@@ -525,7 +525,7 @@ void AliTPCtrackerMI::LoadOuterSectors() {
   Int_t j=Int_t(fClustersArray.GetTree()->GetEntries());
   for (Int_t i=0; i<j; i++) {
     //  AliSegmentID *s=fClustersArray.LoadEntry(i);
-    AliSegmentID *s= fClustersArray.At(i);
+    AliSegmentID *s= const_cast<AliSegmentID*>(fClustersArray.At(i));
     Int_t sec,row;
     AliTPCParam *par=(AliTPCParam*)fClustersArray.GetParam();
     par->AdjustSectorRow(s->GetID(),sec,row);
@@ -552,7 +552,7 @@ void AliTPCtrackerMI::LoadInnerSectors() {
   Int_t j=Int_t(fClustersArray.GetTree()->GetEntries());
   for (Int_t i=0; i<j; i++) {
     //   AliSegmentID *s=fClustersArray.LoadEntry(i);
-    AliSegmentID *s=fClustersArray.At(i);
+    AliSegmentID *s=const_cast<AliSegmentID*>(fClustersArray.At(i));
     Int_t sec,row;
     AliTPCParam *par=(AliTPCParam*)fClustersArray.GetParam();
     par->AdjustSectorRow(s->GetID(),sec,row);
@@ -989,7 +989,7 @@ void  AliTPCtrackerMI::SignShared(AliTPCseed * s1, AliTPCseed * s2)
 
 
 
-void  AliTPCtrackerMI::RemoveOverlap(TObjArray * arr, Float_t factor, Int_t removalindex , Bool_t shared=kFALSE){
+void  AliTPCtrackerMI::RemoveOverlap(TObjArray * arr, Float_t factor, Int_t removalindex , Bool_t shared){