Changeset 26764 for branches/eam_branches/20091201/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

Timestamp:

Feb 2, 2010, 7:06:18 PM (17 years ago)

Author:

watersc1

Message:

new burntool code

File:

• branches/eam_branches/20091201/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c (modified) (6 diffs)

branches/eam_branches/20091201/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) {
-         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(ABS(boxbuf[nbox].nfit) > 0) {
+         boxbuf[nbox].zero = (double *)calloc(ABS(boxbuf[nbox].nfit), sizeof(double));
+         boxbuf[nbox].xfit = (int *)calloc(ABS(boxbuf[nbox].nfit), sizeof(int));
+         boxbuf[nbox].yfit = (int *)calloc(ABS(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<ABS(boxbuf[nbox].nfit); i++) {
             if(fgets(line, 1024, fp) == NULL) {
                fprintf(stderr, "\rerror: short read of burn lines\n");
@@ -85 +92 @@
    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;
       }
@@ -149 +159 @@
          k = boxid[kp];
          zk = 0.0;
-         if(box[k].nfit > 0) zk = box[k].zero[box[k].nfit/2];
+         if(ABS(box[k].nfit) > 0) zk = box[k].zero[ABS(box[k].nfit)/2];
          for(jp=kp+1; jp<n; jp++) {
             j = boxid[jp];
             zj = 0.0;
-            if(box[j].nfit > 0) zj = box[j].zero[box[j].nfit/2];
+            if(ABS(box[j].nfit) > 0) zj = box[j].zero[ABS(box[j].nfit)/2];
             if(ABS(yctr[jp]-yctr[kp]) > DIFFERENT_STREAK) {
 /* Trim back the feebler streak */
@@ -242 +252 @@
       for(k=0; k<cell[j].npersist; k++) {
 
+/* 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 */
@@ -265 +279 @@
                  cell[j].persist[k].slope, cell[j].persist[k].nfit,
                  cell[j].persist[k].sxfit, cell[j].persist[k].exfit);
-         for(i=0; i<cell[j].persist[k].nfit; i++) {
+         for(i=0; i<ABS(cell[j].persist[k].nfit); i++) {
             fprintf(fp, "%3d %3d %8.4f\n", cell[j].persist[k].xfit[i], 
                     cell[j].persist[k].yfit[i], cell[j].persist[k].zero[i]);
@@ -301 +315 @@
                  cell[j].burn[k].slope, cell[j].burn[k].nfit,
                  cell[j].burn[k].sxfit, cell[j].burn[k].exfit);
-         for(i=0; i<cell[j].burn[k].nfit; i++) {
+         for(i=0; i<ABS(cell[j].burn[k].nfit); i++) {
             fprintf(fp, "%3d %3d %8.4f\n", cell[j].burn[k].xfit[i], 
                     cell[j].burn[k].yfit[i], cell[j].burn[k].zero[i]);