Changeset 27840 for branches/simtest_nebulous_branches/extsrc/gpcsw/gpcsrc/fits/burntool/trailfit.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/burntool/trailfit.c (modified) (5 diffs)

branches/simtest_nebulous_branches/extsrc/gpcsw/gpcsrc/fits/burntool/trailfit.c

@@ -30 +30 @@
 
    if(box->func != BURN_PWR && box->func != BURN_EXP) {
-      fprintf(stderr, "error: unimplemented fit function %d\n", box->func);
+      fprintf(stderr, "error: unimplemented fit function %d (err %d)\n", 
+              box->func, box->fiterr);
       return(-1);
    }
@@ -137 +138 @@
    box->xfit = (int *)calloc(xe-xs+1, sizeof(int));
    box->yfit = (int *)calloc(xe-xs+1, sizeof(int));
+   if(box->zero == NULL || box->xfit == NULL || box->yfit == NULL) {
+      fprintf(stderr, "\rerror: failed to alloc box memory\n");
+      exit(-679);
+   }
 /* Some defaults */
    box->slope = 0.0;
@@ -226 +231 @@
 /* FIXME: sanity check fits */
    if(slope >= FIT_MAX_SLOPE || slope < FIT_MIN_SLOPE) {
+      box->slope = slope;
+      box->nfit = 0;
       box->fiterr = FIT_SLOPE_ERROR;
+/* Check whether it's a significant trail (but with pos slope) or just noise */
+      linearrms(nfit, ybuf+y1, zbuf+y1, slope, zero, &trial);
+/* 100203 JT: bad idea: appears to be a bug in read/writing ABS(nfit) */
+//      if(trial > 2*rms) box->nfit = -box->nfit;
+      if(trial > 2*rms) box->func = BURN_POSSLOPE;
       return(-1);
    }
@@ -266 +278 @@
 /* FIXME: what's a really good criterion for negligible fit? */
 /* 100 pixels up fit is zsum or ~zsum/e */
-      if(zsum > NEGLIGIBLE_TRAIL*rms) {
+//      if(zsum > NEGLIGIBLE_TRAIL*rms) {
+      if(zsum > NEGLIGIBLE_TRAIL*rms ||
+/* 100113: but also evaluate at the end of the fit for stubby trails */
+         zbuf[y2]*zsum > NEGLIGIBLE_TRAIL*rms) {
 
 /* Ascertain the starting point of where the fit is good */
@@ -283 +298 @@
    }
 /* Update fit ranges */
-   box->sxfit = box->xfit[0];
-   box->exfit = box->xfit[box->nfit-1];
-
+   if(box->nfit > 0) {
+      box->sxfit = box->xfit[0];
+      box->exfit = box->xfit[box->nfit-1];
+   } else {
+      box->sxfit = xs;
+      box->exfit = xs - 1;
+      box->fiterr = FIT_ALL_GONE;
+   }
+//   if(box->nfit <= 0) fprintf(stderr, "WHOA, got nfit = 0\n");
    return(0);
 }