Changeset 25210 for branches/czw_branch/cleanup/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

Timestamp:

Aug 26, 2009, 4:56:14 PM (17 years ago)

Author:

watersc1

Message:

alterations to ppImage to allow masking of burntool remnants by ppImage.

File:

• branches/czw_branch/cleanup/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c (modified) (4 diffs)

branches/czw_branch/cleanup/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

@@ -51 +51 @@
              &boxbuf[nbox].slope, &boxbuf[nbox].nfit,
              &boxbuf[nbox].sxfit, &boxbuf[nbox].exfit);
-      if(boxbuf[nbox].nfit <= 0) continue;
-      boxbuf[nbox].zero = (double *)calloc(boxbuf[nbox].nfit, sizeof(double));
-      boxbuf[nbox].xfit = (int *)calloc(boxbuf[nbox].nfit, sizeof(int));
-      boxbuf[nbox].yfit = (int *)calloc(boxbuf[nbox].nfit, sizeof(int));
-      for(i=0; i<boxbuf[nbox].nfit; i++) {
-         if(fgets(line, 1024, fp) == NULL) {
-            fprintf(stderr, "\rerror: short read of burn lines\n");
-            return(-1);
-         }
-         sscanf(line, "%d %d %lf\n", &boxbuf[nbox].xfit[i], 
-                &boxbuf[nbox].yfit[i], &boxbuf[nbox].zero[i]);
+      if(boxbuf[nbox].nfit > 0) {
+         boxbuf[nbox].zero = (double *)calloc(boxbuf[nbox].nfit, sizeof(double));
+         boxbuf[nbox].xfit = (int *)calloc(boxbuf[nbox].nfit, sizeof(int));
+         boxbuf[nbox].yfit = (int *)calloc(boxbuf[nbox].nfit, sizeof(int));
+         for(i=0; i<boxbuf[nbox].nfit; i++) {
+            if(fgets(line, 1024, fp) == NULL) {
+               fprintf(stderr, "\rerror: short read of burn lines\n");
+               return(-1);
+            }
+            sscanf(line, "%d %d %lf\n", &boxbuf[nbox].xfit[i], 
+                   &boxbuf[nbox].yfit[i], &boxbuf[nbox].zero[i]);
+         }
       }
       boxbuf[nbox].fiterr = 0;
@@ -147 +148 @@
       for(kp=0; kp<n; kp++) {
          k = boxid[kp];
-         zk = box[k].zero[box[k].nfit/2];
+         zk = 0.0;
+         if(box[k].nfit > 0) zk = box[k].zero[box[k].nfit/2];
          for(jp=kp+1; jp<n; jp++) {
             j = boxid[jp];
-            zj = box[j].zero[box[j].nfit/2];
+            zj = 0.0;
+            if(box[j].nfit > 0) zj = box[j].zero[box[j].nfit/2];
             if(ABS(yctr[jp]-yctr[kp]) > DIFFERENT_STREAK) {
 /* Trim back the feebler streak */
@@ -238 +241 @@
 /* First: patched up persists */
       for(k=0; k<cell[j].npersist; k++) {
-         if(cell[j].persist[k].fiterr) continue;
-         if(cell[j].persist[k].nfit <= 0) continue;
+
+         if(PERSIST_RETAIN) {
+/* Keep fits which have a dubious slope */
+            if(cell[j].persist[k].fiterr != FIT_SLOPE_ERROR) {
+               if(cell[j].persist[k].fiterr) continue;
+               if(cell[j].persist[k].nfit <= 0) continue;
+            }
+         } else {
+            if(cell[j].persist[k].fiterr) continue;
+            if(cell[j].persist[k].nfit <= 0) continue;
+         }
          fprintf(fp, "%3d %7d  %3d %3d %5d %3d  %3d %3d  %3d %3d  %3d %3d %3d %3d %3d %3d %3d %3d  %1d %1d %9.6f %3d %3d %3d\n",
                  j, cell[j].persist[k].time, 
@@ -262 +274 @@
       for(k=0; k<cell[j].nburn; k++) {
          if(!cell[j].burn[k].burned) continue;
-         if(cell[j].burn[k].fiterr && 
-            cell[j].burn[k].fiterr != FIT_TOP_ERROR) continue;
-         if(cell[j].burn[k].nfit <= 0) continue;
+         if(PERSIST_RETAIN) {
+/* Keep fits which have a dubious slope */
+            if(cell[j].burn[k].fiterr != FIT_SLOPE_ERROR) {
+               if(cell[j].burn[k].fiterr && 
+                  cell[j].burn[k].fiterr != FIT_TOP_ERROR) continue;
+               if(cell[j].burn[k].nfit <= 0) continue;
+            }
+         } else {
+            if(cell[j].burn[k].fiterr && 
+               cell[j].burn[k].fiterr != FIT_TOP_ERROR) continue;
+            if(cell[j].burn[k].nfit <= 0) continue;
+         }
 
          i = (cell[j].burn[k].ex - cell[j].burn[k].sx + 1) / 2;