Using TMath::Abs instead of fabs, arrays of variable size created/deleted correctly...

diff --git a/TOF/AliTOFGeometry.cxx b/TOF/AliTOFGeometry.cxx
index 135f8434c3da814d8fe5806b1ae2bece3b5889ee..e901b51136c86af88f628b43ce636569647eeefe 100644 (file)
--- a/TOF/AliTOFGeometry.cxx
+++ b/TOF/AliTOFGeometry.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.4  2004/04/13 09:42:51  decaro
+Track reconstruction code for TOF: updating
+
 Revision 1.3  2003/12/29 18:40:39  hristov
 Copy/paste error corrected
 
@@ -262,7 +265,7 @@ Bool_t AliTOFGeometry::IsInsideThePad(Int_t *det, Float_t *pos)
   Float_t yr = yt;
   Float_t zr = -xt*TMath::Sin(alpha/kRaddeg)+zt*TMath::Cos(alpha/kRaddeg);
 
-  if(fabs(xr)<=0.75 && fabs(yr)<= (fgkXPad*0.5) && fabs(zr)<= (fgkZPad*0.5))
+  if(TMath::Abs(xr)<=0.75 && TMath::Abs(yr)<= (fgkXPad*0.5) && TMath::Abs(zr)<= (fgkZPad*0.5))
     isInside=true; 
   return isInside;
 

diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx
index 5eb6d86cab6fc26b0c032be5e1eb02fe7baf1dbe..98bb5207376facbb27af78a324f1a3ce98e90036 100644 (file)
--- a/TOF/AliTOFtracker.cxx
+++ b/TOF/AliTOFtracker.cxx
@@ -229,7 +229,9 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     Float_t        dist[10000];
     Float_t       cxpos[10000];
     Float_t       crecL[10000];
-    Float_t trackPos[4][nSteps];
+    Float_t * trackPos[4];
+    for (Int_t ii=0; ii<4; ii++) trackPos[ii] = new Float_t[nSteps];
+    //    Float_t trackPos[4][nSteps];
      
     // Determine a window around the track
 
@@ -250,7 +252,9 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     if (phi>=TMath::Pi())phi-=2*TMath::Pi();
     Double_t z=par[1];   
 
-    Int_t clind[6][fN];
+    Int_t * clind[6];
+    for (Int_t ii=0;ii<6;ii++) clind[ii] = new Int_t[fN];
+    //    Int_t clind[6][fN];
     Int_t nc=0;
     
     // find the clusters in the window of the track
@@ -262,7 +266,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
       
       Double_t dph=TMath::Abs(c->GetPhi()-phi);
       if (dph>TMath::Pi()) dph-=2.*TMath::Pi();
-      if (fabs(dph)>dphi) continue;
+      if (TMath::Abs(dph)>dphi) continue;
     
       clind[0][nc] = c->GetDetInd(0);
       clind[1][nc] = c->GetDetInd(1);
@@ -343,9 +347,14 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
          if(isInside)break;
        }//end if accept
       } //end for on the clusters
+
+
       if(isInside)break;
     } //end for on the steps     
 
+    for (Int_t ii=0;ii<6;ii++) delete [] clind[ii];
+
+
     if (nfound == 0 ) {
       fnunmatch++;
       continue;
@@ -414,6 +423,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){
     t->SetIntegratedTimes(time);
 
     delete trackTOFout;
+    for (Int_t ii=0; ii<4; ii++) delete [] trackPos[ii];
   }
 }
 //_________________________________________________________________________