Changes to compile on gcc-2.95 with ansi enabled.

diff --git a/HLT/comp/AliL3FitUtilities.c b/HLT/comp/AliL3FitUtilities.c
index fd996bd2aa93fa6060abf90b12de9801c85eb00b..1d3aa08410aec1aaff6408597b92586c0b788492 100644 (file)
--- a/HLT/comp/AliL3FitUtilities.c
+++ b/HLT/comp/AliL3FitUtilities.c
@@ -12,22 +12,22 @@ DPOINT *plane;
 
 void f2gauss5(double x,double a[],double *y,double dyda[],int na)
 {
-  //Function describing a sum of 2D gaussians with 5 parameters.
-  //There number of gaussians is na/5.
+  /* Function describing a sum of 2D gaussians with 5 parameters.
+     There number of gaussians is na/5.*/
   
   int i,index;
   double fac,fac1,fac2,ex,ex1,ex2,arg1,arg2,u,v;
   
-  //printf("fitting na %d, with pad %f time %f amplitude %f padwidth %f timewidth %f\n",na,a[2],a[4],a[1],a[3],a[5]);
+  /*printf("fitting na %d, with pad %f time %f amplitude %f padwidth %f timewidth %f\n",na,a[2],a[4],a[1],a[3],a[5]);*/
         index = nint(x);
        if( index < 0 || index >=FIT_PTS )
        {
-               fprintf( stderr, "ff2gauss: wrong index %ld\n", index );
+               fprintf( stderr, "ff2gauss: wrong index %d\n", index );
                return;
        }
        u     = plane[index].u;
        v     = plane[index].v;
-       //printf("u %f v %f\n",u,v);
+       /*printf("u %f v %f\n",u,v);*/
        *y=0.0;
        for (i=1;i<=na-1;i+=5)
        {
@@ -50,9 +50,11 @@ void f2gauss5(double x,double a[],double *y,double dyda[],int na)
 
 void nrerror(char error_text[])
 /* Numerical Recipes standard error handler */
-{
-  //printf("%s\n",error_text);
-  //exit(1);
+{ 
+  /*
+    printf("%s\n",error_text);
+    exit(1);
+  */
 }
 
 void free_vector(double *v, long nl, long nh)
@@ -121,7 +123,7 @@ double **matrix(long nrl,long nrh,long ncl,long nch)
 int gaussj(double **a, int n, double **b, int m)
 {
        int *indxc,*indxr,*ipiv;
-       int i,icol,irow,j,k,l,ll;
+       int i,icol=0,irow=0,j,k,l,ll;
        double big,dum,pivinv,swap;
 
        indxc=ivector(1,n);
@@ -373,7 +375,7 @@ int lev_marq_fit( double x[], double y[], double sig[], int NPT, double a[], int
                return 0;
        }
        else {
-         //if( control_g.print_fit_errors==2 )
+         /*if( control_g.print_fit_errors==2 )*/
          fprintf( stderr, " runtime error\n" );
 
                free_matrix(alpha,1,MA,1,MA);

diff --git a/HLT/comp/AliL3FitUtilities.h b/HLT/comp/AliL3FitUtilities.h
index 3b3d876e8ae496b4b2df840ef7b51c5fa3c3901b..00be2f7309d0b1f50b57b8c1347b402f9439ee6c 100644 (file)
--- a/HLT/comp/AliL3FitUtilities.h
+++ b/HLT/comp/AliL3FitUtilities.h
@@ -1,10 +1,10 @@
-// @(#) $Id$
+/* @(#) $Id$ */
 
 #ifndef AliL3FitUtilities
 #define AliL3FitUtilities
 
-//This we do because this file is read both with c and c++ compiler, 
-//and extern "C" is needed only in case of c++.
+/* This we do because this file is read both with c and c++ compiler, 
+   and extern "C" is needed only in case of c++. */
 #ifdef __cplusplus
 extern "C" 
 #endif
@@ -30,8 +30,6 @@ int lev_marq_fit( double x[], double y[], double sig[], int NPT, double a[], int
 #define NR_END 1
 #define FREE_ARG char*
 #define EPSILON             1.0E-12
-//#define TRUE 1
-//#define FALSE 1
 #define FIT_PTS     2000
 #define  FIT_MAXPAR   41
 #define NUM_PARS 5
@@ -43,7 +41,7 @@ struct DPOINT {
 };
 typedef struct DPOINT DPOINT;
 
-extern  DPOINT *plane; //!
+extern  DPOINT *plane;
 
 typedef struct { 
                                        long   float_size;

diff --git a/HLT/comp/bitio.h b/HLT/comp/bitio.h
index 55637940ee4f8553d16cc66ab23f44cffb0cb555..29805264fda2cfb55fe0e789bb22ab4dca811fb3 100644 (file)
--- a/HLT/comp/bitio.h
+++ b/HLT/comp/bitio.h
@@ -1,4 +1,4 @@
-// @(#) $Id$
+/* @(#) $Id$ */
 
 /************************** Start of BITIO.H *************************/
 
@@ -14,10 +14,9 @@ typedef struct bit_file {
     int pacifier_counter;
 } BIT_FILE;
 
-//#ifdef __STDC__
 
-//The following we do because this file is read both by
-//C and C++ compiler.
+/* The following we do because this file is read both by
+   C and C++ compiler. */
 #ifdef __cplusplus
 extern "C" BIT_FILE     *OpenInputBitFile( char *name );
 extern "C" BIT_FILE     *OpenOutputBitFile( char *name );
@@ -60,5 +59,3 @@ void          FilePrintBinary();
 #endif  /* _BITIO_H */
 
 /*************************** End of BITIO.H **************************/
-
-

diff --git a/HLT/comp/errhand.h b/HLT/comp/errhand.h
index b176809488eb9f3bef787d13d55fe95b2a3eaed7..017b0f045d331cf75ecf9a7416591a6022b44af6 100644 (file)
--- a/HLT/comp/errhand.h
+++ b/HLT/comp/errhand.h
@@ -1,12 +1,10 @@
-// @(#) $Id$
+/* @(#) $Id$ */
 
 /************************* Start of ERRHAND.H ************************/
 
 #ifndef _ERRHAND_H
 #define _ERRHAND_H
 
-//#ifdef __STDC__
-
 void fatal_error( char *fmt, ... );
 /*
 #else
@@ -18,4 +16,3 @@ void fatal_error();
 #endif  /* _ERRHAND_H */
 
 /************************** End of ERRHAND.H *************************/
-