Fixes.

diff --git a/HLT/comp/AliL3Compress.h b/HLT/comp/AliL3Compress.h
index 92dbee9b0e479f4701a863941625e6c050594471..d6e0744bc09e14f305077da44c03ab60a5043bcf 100644 (file)
--- a/HLT/comp/AliL3Compress.h
+++ b/HLT/comp/AliL3Compress.h
@@ -4,6 +4,7 @@
 #define AliL3_Compress
 
 #include "AliL3RootTypes.h"
+#include "AliL3StandardIncludes.h"
 #include "AliL3DataCompressor.h"
 
 class AliL3Compress {

diff --git a/HLT/comp/AliL3FitUtilities.c b/HLT/comp/AliL3FitUtilities.c
index 5287932b392515dcfdcf118afdf659f8231777a0..3639874c2ba914df360184590a25b16ab7b1689b 100644 (file)
--- a/HLT/comp/AliL3FitUtilities.c
+++ b/HLT/comp/AliL3FitUtilities.c
@@ -12,13 +12,13 @@ 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 )
        {
@@ -27,7 +27,7 @@ void f2gauss5(double x,double a[],double *y,double dyda[],int na)
        }
        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)
        {
@@ -51,8 +51,8 @@ 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)
@@ -373,7 +373,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..9e71163094220b6a876d915c1244e2bb36ec1c31 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..287124fa3c83f3142b282cb77ab0b30ab13cdc02 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 );

diff --git a/HLT/comp/errhand.h b/HLT/comp/errhand.h
index b176809488eb9f3bef787d13d55fe95b2a3eaed7..1b272c2a08c09ac776ced31e561a5938faf1c739 100644 (file)
--- a/HLT/comp/errhand.h
+++ b/HLT/comp/errhand.h
@@ -1,20 +1,13 @@
-// @(#) $Id$
+/* @(#) $Id$ */
 
 /************************* Start of ERRHAND.H ************************/
 
 #ifndef _ERRHAND_H
 #define _ERRHAND_H
 
-//#ifdef __STDC__
 
 void fatal_error( char *fmt, ... );
-/*
-#else
 
-void fatal_error();
-
-#endif
-*/
 #endif  /* _ERRHAND_H */
 
 /************************** End of ERRHAND.H *************************/

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index a370bc02af2172d2867c65d305a412099602a58e..473287c2a4a8f52edaec29ff73de9b5b2090e798 100644 (file)
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -2,7 +2,7 @@
 # $Id$
 
 HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc \
-               -DROWHOUGHPARAMS -DROWHOUGH \
+               -DROWHOUGHPARAMS -Duse_reconstruction\
                -Duse_newio -DROOTVERSION=\"unchecked\" \
                -DALIROOTVERSION=\"unchecked\"
 

diff --git a/HLT/libAliL3Comp.pkg b/HLT/libAliL3Comp.pkg
index 5424cd3c08ab72bdaf4a9bf968d19cb1dec336b5..962a12af6f2806d356cbcc3cdd00703c172f03aa 100644 (file)
--- a/HLT/libAliL3Comp.pkg
+++ b/HLT/libAliL3Comp.pkg
@@ -9,7 +9,8 @@ comp/AliL3DataCompressor.cxx \
 comp/AliL3DataCompressorHelper.cxx \
 comp/AliL3ModelTrack.cxx \
 comp/AliL3Modeller.cxx \
-comp/AliL3OfflineDataCompressor.cxx
+comp/AliL3OfflineDataCompressor.cxx \
+comp/AliL3CompressAC.cxx
 
 CSRCS:= comp/AliL3FitUtilities.c comp/bitio.c comp/errhand.c
 

diff --git a/HLT/libAliL3Hough.pkg b/HLT/libAliL3Hough.pkg
index 1424276e9622f7f420eed076dc2dd92c8c519cfa..ef875e56f00c53025acfe53e74607054444f2073 100644 (file)
--- a/HLT/libAliL3Hough.pkg
+++ b/HLT/libAliL3Hough.pkg
@@ -29,7 +29,7 @@ HDRS:= $(SRCS:.cxx=.h) $(HLTEHDRS)
 
 DHDR:= hough/AliL3HoughLinkDef.h
 
-EDEFINE      := ${HLTDEFS} -DROWHOUGH
+EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}