Changeset 42392 for trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burnfix.c

Timestamp:

Feb 14, 2023, 12:48:54 PM (3 years ago)

Author:

tdeboer

Message:

new version of the burntool programme

File:

• trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burnfix.c (modified) (10 diffs)

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

@@ -23 +23 @@
 /* Find all the burned patches and bright stars */
    err = star_detect(nx, ny, NX, NY, imbuf, mbuf, msbuf, cell, cellnum);
+
    err = burn_check(nx, ny, NX, NY, imbuf, mbuf, cell);
 
@@ -34 +35 @@
 //   fprintf(stderr, "Got through grow mask for burns\n");
    err = grow_mask(nx, ny, NX, mbuf, BMASK_GROW, RMASK_GROW, 
-                   MASK_STAR_HALO, cell->nstar, cell->star);
+         MASK_STAR_HALO, cell->nstar, cell->star);
 //   fprintf(stderr, "Got through grow mask for stars\n");
 
@@ -70 +71 @@
    printf("  #    cx  cy  max     sx  sy    ex  ey  midy  diff  S/B/E  slope     zero\n");
    for(k=0; k<cell->nburn; k++) {
-      ymid = (cell->burn[k].y0m + cell->burn[k].y1m +
-              cell->burn[k].y0p + cell->burn[k].y1p + 2) / 4;
+      /*ymid = (cell->burn[k].y0m + cell->burn[k].y1m +
+              cell->burn[k].y0p + cell->burn[k].y1p + 2) / 4;*/
+      ymid = (cell->burn[k].sy + cell->burn[k].ey + 1) / 2;
       i = cell->burn[k].nfit / 2;
       printf("%3d %5d %3d %5d %5d %3d %5d %3d %5d %5d %2d %1d %1d %6.3f %8d\n", 
@@ -88 +90 @@
    printf("  #    cx  cy  max     sx  sy    ex  ey  midy  S/P\n");
    for(k=0; k<cell->nstar; k++) {
-      ymid = (cell->star[k].y0m + cell->star[k].y1m +
-              cell->star[k].y0p + cell->star[k].y1p + 2) / 4;
+      /*ymid = (cell->star[k].y0m + cell->star[k].y1m +
+              cell->star[k].y0p + cell->star[k].y1p + 2) / 4;*/
+      ymid = (cell->star[k].sy + cell->star[k].ey + 1) / 2;
 
       printf("%3d %5d %3d %5d %5d %3d %5d %3d %5d %2d %1d\n", 
@@ -142 +145 @@
                        MTYPE *mask, CELL *cell)
 {
-   int err, k;
+   int err,k;
 
 /* Given these big stars, identify which ones really have a burn */
@@ -160 +163 @@
              k, cell->burn[k].sx, cell->burn[k].sy, 
              cell->burn[k].ex, cell->burn[k].ey, 
-             cell->burn[k].y0m, cell->burn[k].y1m, cell->burn[k].y0p, cell->burn[k].y0p,
+             cell->burn[k].y0m, cell->burn[k].y1m, cell->burn[k].y0p, cell->burn[k].y1p,
              cell->burn[k].diff, cell->burn[k].burned);
    }
@@ -242 +245 @@
    int y0, y1, ymid, xburn, xref, dx=0, dy=0;
 
+   /*introduce a maximum to the burn contrast check, to avoid a very large number in crowded regions*/
+   int burn_contrast = MIN(0.3*rms,5); 
+   /*introduce a maximum size for the burn contrast check box, instead of a random large 100 pixels */
+   /*for small stars you will lose signal after 10 pixels, so use the fitted box size as a good guide*/
+   int test_box = MAX(box->ey-box->sy,10); 
+
+   if(VERBOSE & VERB_BOXGROW) {
+        printf("burn contrast test using box of max size: %8d\n", test_box);
+   }
+
 /* FIXME: needs a test for flat-toppedness as well as trail... */
 /* FIXME: needs a test for pure, massive saturation */
 
 /* Center line */
-   ymid = (box->y0m + box->y0p + box->y1m + box->y1p + 2) / 4;
+   //ymid = (box->y0m + box->y0p + box->y1m + box->y1p + 2) / 4;
+   ymid = (box->sy+box->ey)/2;
 
 /* Irrelevant, too near the top to detect a burn anyway */
@@ -283 +297 @@
       y0 = ymid + dy;
       y1 = y0 + MIN(ny-1-y0, 2*ymid-y0-1);
-      if(y1-y0 > 100) y1 = y0 + 100;
+      if(y1-y0 > test_box) y1 = y0 + test_box;
    }
 
@@ -292 +306 @@
       nburn = nref = 0;
       for(i=box->sx; i<=box->ex; i++) {
-         if(mask[i+j*NX] == MASK_NONE) {
-            xburn += data[i+j*NX];
-            nburn++;
-         }
-         if(dx != 0) {  /* Side to side */
-            if(mask[i+dx+j*NX] == MASK_NONE) {
-               xref += data[i+dx+j*NX];
-               nref++;
-            }
-         } else {       /* top-bottom */
-            if(mask[i+(2*ymid-j)*NX] == MASK_NONE) {
-               xref += data[i+(2*ymid-j)*NX];
-               nref++;
-            }
-         }
+             if(mask[i+j*NX] == MASK_NONE) {
+               xburn += data[i+j*NX];
+               nburn++;
+             }
+             if(dx != 0) {      /* Side to side */
+               if(mask[i+dx+j*NX] == MASK_NONE) {
+                xref += data[i+dx+j*NX];
+                nref++;
+               }
+             } else {   /* top-bottom */
+               if(mask[i+(2*ymid-j)*NX] == MASK_NONE) {
+                xref += data[i+(2*ymid-j)*NX];
+                nref++;
+               }
+             }
       }
       if(nburn > 0) xburn /= nburn;
       if(nref > 0) xref /= nref;
       if(nref > 0 && nburn > 0) median_buf[nmed++] = xburn - xref;
+      if(VERBOSE & VERB_BOXGROW) {
+        printf("contrast: %8d %8d %8d %8d %8d\n", j, xburn, (2*ymid-j), xref, xburn - xref);
+      }
+
    }
    box->diff = int_median(nmed, median_buf);
-   box->burned = (box->diff > 0.3*rms);
+   box->burned = (box->diff > burn_contrast);
    return(0);
 }
@@ -335 +353 @@
 
 /* Center line */
-   ymid = (box->y0m + box->y0p + box->y1m + box->y1p + 2) / 4;
+   //ymid = (box->y0m + box->y0p + box->y1m + box->y1p + 2) / 4;
+   ymid = (box->sy + box->ey + 1) / 2;
 
 /* Starting point offset */