Changeset 27840 for branches/simtest_nebulous_branches/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.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/persistio.c (modified) (9 diffs)

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

@@ -16 +16 @@
 /****************************************************************/
 /* persist_read(): Read all the persistence trails from a file */
-STATIC int persist_read(CELL *cell, const char *infile)
+STATIC int persist_read(CELL *cell, const char *infile, int apply)
 {
    int i, k, nbox=0;
@@ -38 +38 @@
    while(fgets(line, 1024, fp) != NULL) {
       if(line[0] == '#') continue;
-      sscanf(line, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %lf %d %d %d",
+      sscanf(line, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %lf %d %d %d %d",
              &boxbuf[nbox].cell, &boxbuf[nbox].time,
              &boxbuf[nbox].cx, &boxbuf[nbox].cy,
@@ -50 +50 @@
              &boxbuf[nbox].func, &boxbuf[nbox].up,
              &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]);
-      }
-      boxbuf[nbox].fiterr = 0;
+             &boxbuf[nbox].sxfit, &boxbuf[nbox].exfit,
+             &boxbuf[nbox].fiterr);
+      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));
+         if(boxbuf[nbox].zero == NULL ||
+            boxbuf[nbox].xfit == NULL ||
+            boxbuf[nbox].yfit == NULL) {
+            fprintf(stderr, "\rerror: failed to alloc boxbuf\n");
+            exit(-673);
+         }
+
+         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]);
+         }
+      }
+// 100203 JT: fiterr now saved and read, refit if not just an "apply"
+      if(!apply) boxbuf[nbox].fiterr = 0;
 /* Augment counts */
       k = boxbuf[nbox].cell;
@@ -84 +94 @@
    for(k=0; k<MAXCELL; k++) {
       if( (i=cell[k].npersist) > 0) {
-         cell[k].persist = (OBJBOX *)calloc(i, sizeof(OBJBOX));
+         if( (cell[k].persist = (OBJBOX *)calloc(i, sizeof(OBJBOX))) == NULL) {
+            fprintf(stderr, "\rerror: failed to alloc cell persist buffer\n");
+            exit(-674);
+         }
          cell[k].npersist = 0;
       }
@@ -147 +160 @@
       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 +253 @@
 /* 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;
-         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",
+
+/* Retire old burns */
+         if(cell[j].time - cell[j].persist[k].time > EXPIRE_TRAIL_TIME)
+            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 %d\n",
                  j, cell[j].persist[k].time, 
                  cell[j].persist[k].cx, cell[j].persist[k].cy, 
@@ -252 +280 @@
                  cell[j].persist[k].func, cell[j].persist[k].up, 
                  cell[j].persist[k].slope, cell[j].persist[k].nfit,
-                 cell[j].persist[k].sxfit, cell[j].persist[k].exfit);
+                 cell[j].persist[k].sxfit, cell[j].persist[k].exfit, 
+                 cell[j].persist[k].fiterr);
          for(i=0; i<cell[j].persist[k].nfit; i++) {
             fprintf(fp, "%3d %3d %8.4f\n", cell[j].persist[k].xfit[i], 
@@ -262 +291 @@
       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;
-         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", 
+         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 %d\n", 
                  j, cell[j].burn[k].time, 
                  cell[j].burn[k].cx, cell[j].burn[k].cy,
@@ -279 +317 @@
                  cell[j].burn[k].func, cell[j].burn[k].up, 
                  cell[j].burn[k].slope, cell[j].burn[k].nfit,
-                 cell[j].burn[k].sxfit, cell[j].burn[k].exfit);
+                 cell[j].burn[k].sxfit, cell[j].burn[k].exfit, 
+                 cell[j].burn[k].fiterr);
          for(i=0; i<cell[j].burn[k].nfit; i++) {
             fprintf(fp, "%3d %3d %8.4f\n", cell[j].burn[k].xfit[i],