Commit ff13ac00 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed CONCENTRATION_MODEL issue. 

Removed singular matrix warning.
Added MATRIX_MODELERR measurement parameters.
Added DURATION_ANALYSIS measurement parameter.
parent 0b1bc817

config.h.in

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ 
/* Define to 1 if you have the `getpagesize' function. */

#undef HAVE_GETPAGESIZE



/* Define to 1 if you have the `gettimeofday' function. */

#undef HAVE_GETTIMEOFDAY



/* Define to 1 if you have the <inttypes.h> header file. */

#undef HAVE_INTTYPES_H

configure

+2 −1
Original line number Diff line number Diff line
@@ -22427,8 +22427,9 @@ done 
































for ac_func in atexit getenv memcpy memmove memset mkdir munmap strstr \









		sincosf logf









		sincosf logf gettimeofday









do









as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`









{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

























configure.ac



+1
−1






























Original line number
Diff line number
Diff line







@@ -93,7 +93,7 @@ AC_TYPE_SIGNAL







AC_FUNC_STAT









AC_FUNC_STRFTIME









AC_CHECK_FUNCS([atexit getenv memcpy memmove memset mkdir munmap strstr \









		sincosf logf])









		sincosf logf gettimeofday])



















# Check support for large files









AC_SYS_LARGEFILE
































src/analyse.c



+12
−5






























Original line number
Diff line number
Diff line







@@ -9,7 +9,7 @@







*









*	Contents:	analyse(), endobject()...: measurements on detections.









*









*	Last modify:	11/09/2009









*	Last modify:	24/09/2009









*









*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%









*/








@@ -387,9 +387,13 @@ void	endobject(picstruct *field, picstruct *dfield, picstruct *wfield,







  {









   objstruct		*obj;









   checkstruct		*check;









   double	rawpos[NAXIS];









   double		rawpos[NAXIS],









			analtime1;









   int			i,j, ix,iy,selecflag, newnumber,nsub;



















  if (FLAG(obj2.analtime))









    analtime1 = counter_seconds();



















  obj = &objlist->obj[n];



















/* Current FITS extension */








@@ -737,6 +741,9 @@ void	endobject(picstruct *field, picstruct *dfield, picstruct *wfield,







          obj->number = ++thecat.ntotal;









        }



















      if (FLAG(obj2.analtime) && !j)









        obj2->analtime = (float)(counter_seconds() - analtime1);



















      FPRINTF(OUTPUT, "%8d %6.1f %6.1f %5.1f %5.1f %12g "









			"%c%c%c%c%c%c%c%c\n",









	obj->number, obj->mx+1.0, obj->my+1.0,
































src/catout.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -9,7 +9,7 @@







*









*	Contents:	functions for output of catalog data.









*









*	Last modify:	16/09/2009









*	Last modify:	24/09/2009









*









*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%









*/








@@ -378,6 +378,7 @@ void	updateparamflags()







			| FLAG(obj2.prof_spheroid_peak);









  prefs.prof_flag |= FLAG(obj2.prof_chi2) | FLAG(obj2.prof_niter)









			| FLAG(obj2.prof_vector) | FLAG(obj2.prof_errvector)









			| FLAG(obj2.prof_errmatrix)









			| FLAG(obj2.x_prof) | FLAG(obj2.y_prof)









			| FLAG(obj2.prof_mx2)









			| FLAG(obj2.peak_prof)