Changeset 25299 for trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persist_fits.c

Timestamp:

Sep 8, 2009, 5:32:55 PM (17 years ago)

Author:

watersc1

Message:

Merge my branch back into the trunk. This includes:

ipp_cleanup.pl : and associated edits to allow cleanup to work
burntool : updated to newest version, ipp_apply_burntool.pl modified to use persist=t options
ppImageBurntoolMask.c : masks region burntool identifies
psastro : allow selection of wcs header format
addtool : splits addstar step off from the camera stage

Location:

trunk

Files:

• . (modified) (1 prop)
• extsrc/gpcsw/gpcsrc/fits/burntool/persist_fits.c (modified) (6 diffs)

trunk/extsrc/gpcsw/gpcsrc/fits/burntool/persist_fits.c

@@ -222 +222 @@
       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;
+         }
          num_areas++;
          num_fits += cell[j].persist[k].nfit;
@@ -232 +240 @@
       {
          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;
+         }
          num_areas++;
          num_fits += cell[j].burn[k].nfit;
@@ -329 +346 @@
       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;     
+         }
 
          result = write_area_row(hu, data, table, row++, &(cell[j].persist[k]));
@@ -340 +365 @@
       {
          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;
+         }
 
          result = write_area_row(hu, data, table, row++, &(cell[j].burn[k]));
@@ -426 +460 @@
       for(k=0; k<cell[j].npersist; k++) 
       {
-         if(cell[j].persist[k].fiterr) 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;
+            }
+         } else {
+            if(cell[j].persist[k].fiterr) continue;
+         }
          for(i=0; i<cell[j].persist[k].nfit; i++) 
          {
@@ -441 +482 @@
       {
          if(!cell[j].burn[k].burned) continue;
-         if(cell[j].burn[k].fiterr && 
-            cell[j].burn[k].fiterr != FIT_TOP_ERROR) 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;
+            }
+         } else {
+            if(cell[j].burn[k].fiterr && 
+               cell[j].burn[k].fiterr != FIT_TOP_ERROR) continue;
+         }
 
          for(i=0; i<cell[j].burn[k].nfit; i++)