Changeset 42753 for branches/eam_branches/ipp-20230313/extsrc/gpcsw/gpcsrc/fits/burntool/burnfix.c

Timestamp:

Dec 6, 2024, 1:28:47 PM (20 months ago)

Author:

eugene

Message:

updates from trunk: burntool improvements

File:

• branches/eam_branches/ipp-20230313/extsrc/gpcsw/gpcsrc/fits/burntool/burnfix.c (modified) (14 diffs)

branches/eam_branches/ipp-20230313/extsrc/gpcsw/gpcsrc/fits/burntool/burnfix.c

@@ -17 +17 @@
 /* burn_fix(): Find and fix all the burned patches in a cell */
 STATIC int burn_fix(int nx, int ny, int NX, int NY, IMTYPE *buf, 
-                    CELL *cell, int cellnum)
+                    CELL *cell, int cellnum, char *camera)
 {
    int k, err;
 
 /* 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);
+   err = star_detect(nx, ny, NX, NY, imbuf, mbuf, msbuf, cell, cellnum, camera);
+
+   err = burn_check(nx, ny, NX, NY, imbuf, mbuf, cell, camera);
 
 //   fprintf(stderr, "Got through burn_check\n");
 
 /* Expand the masks; burns asymmetrically, stars symmetrically */
-//   err = grow_mask(nx, ny, NX, mbuf, YMASK_GROW, YMASK_GROW, cell->nstar, cell->star);
-//   err = grow_mask(nx, ny, NX, mbuf, XMASK_GROW, YMASK_GROW, cell->nburn, cell->burn);
    err = grow_mask(nx, ny, NX, mbuf, BMASK_GROW, RMASK_GROW, 
                    MASK_SAT_HALO, cell->nburn, cell->burn);
@@ -44 +42 @@
 //      fprintf(stderr, "Fitting trail %d\n", k);
       fit_trail(nx, ny, NX, imbuf, mbuf, cell->burn+k, 1, 
-             cell->sky+cell->bias, cell->rms, BURN_PWR);
+             cell->sky+cell->bias, cell->rms, BURN_PWR, camera);
 /* Subtract the fit from the image */
 //      fprintf(stderr, "Subtracting trail %d\n", k);
@@ -54 +52 @@
       for(k=0; k<NX*ny; k++) buf[k] = mbuf[k] - BZERO;
    }
+   
    return(err);
 }
@@ -106 +105 @@
 /****************************************************************/
 /* burn_restore(): Restore the fitted trails back to the image */
-STATIC int burn_restore(int nx, int ny, int NX, IMTYPE *buf, CELL *cell)
+STATIC int burn_restore(int nx, int ny, int NX, IMTYPE *buf, CELL *cell, char *camera)
 {
    int k;
@@ -124 +123 @@
 /****************************************************************/
 /* burn_apply(): Subtract the trail fits from the image */
-STATIC int burn_apply(int nx, int ny, int NX, IMTYPE *buf, CELL *cell)
+STATIC int burn_apply(int nx, int ny, int NX, IMTYPE *buf, CELL *cell, char *camera)
 {
    int k;
@@ -143 +142 @@
 /* burn_check(): Find all the burned patches in a cell */
 STATIC int burn_check(int nx, int ny, int NX, int NY, DTYPE *data,
-                       MTYPE *mask, CELL *cell)
+                       MTYPE *mask, CELL *cell, char *camera)
 {
    int err,k;
@@ -153 +152 @@
          continue;
       }
-      err = burn_test(nx, ny, NX, data, cell->rms, mask, cell->burn+k);
+      err = burn_test(nx, ny, NX, data, cell->rms, mask, cell->burn+k, camera);
    }
 
@@ -240 +239 @@
  */
 STATIC int burn_test(int nx, int ny, int NX, DTYPE *data, int rms,
-                       MTYPE *mask, OBJBOX *box)
+                       MTYPE *mask, OBJBOX *box, char *camera)
 {
    int i, j, nburn, nref, nmed;
-   int y0, y1, ymid, xburn, xref, dx=0, dy=0;
+   int y0, y1, x0, x1, xwidth, ymid, xburn, xref, dx=0, dy=0;
 
    /*introduce a maximum to the burn contrast check, to avoid a very large number in crowded regions*/
@@ -275 +274 @@
       y0 = ymid + MAX(box->ey-ymid, FIT_EDGE);
       y1 = MIN(y0+100, ny-1);
+      x0 = box->sx;
+      x1 = box->ex;
 
       if(2*box->ex - box->sx + 1 < nx-1) {      /* Work right? */
@@ -294 +295 @@
       dx = 0;
       dy = MAX(ymid-box->sy, box->ey-ymid);
+      
+      if(!strcmp(camera,"gpc2")) {
+        /*start right at the edge of the star box might not be the best*/
+        /*add 20% of box size on top, with a maximum of ten pixels*/
+        dy = dy + MIN((box->ey-box->sy)/5,10);
+
+        /*Use the inner third of the star width for this test. Should be brightest there*/
+        xwidth = MAX((box->ex-box->sx)/3,10);      
+        x0 = box->sx + (box->ex-box->sx)/2 - xwidth/2;
+        x1 = box->sx + (box->ex-box->sx)/2 + xwidth/2;
+      } else {
+        //regular gpc1 setup
+        x0 = box->sx;
+        x1 = box->ex;
+      }
+      
       if(dy < FIT_EDGE) dy = FIT_EDGE;
       y0 = ymid + dy;
       y1 = y0 + MIN(ny-1-y0, 2*ymid-y0-1);
       if(y1-y0 > test_box) y1 = y0 + test_box;
+      
+   }
+   if(VERBOSE & VERB_BOXGROW) {
+     printf("test input dx,dy,x0,x1, y0, y1, test_box, ymid: %8d %8d %8d %8d %8d %8d %8d %8d\n", dx,dy,x0,x1, y0, y1, test_box, ymid);
    }
 
@@ -305 +326 @@
       xburn = xref = 0;
       nburn = nref = 0;
-      for(i=box->sx; i<=box->ex; i++) {
+      for(i=x0; i<=x1; i++) {
              if(mask[i+j*NX] == MASK_NONE) {
                xburn += data[i+j*NX];
@@ -326 +347 @@
       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);
+        printf("contrast: %8d %8d %8d %8d %8d %8d %8d\n", j, xburn,nburn, (2*ymid-j), xref,nref, xburn - xref);
       }
 
@@ -332 +353 @@
    box->diff = int_median(nmed, median_buf);
    box->burned = (box->diff > burn_contrast);
+   if(VERBOSE & VERB_BOXGROW) {
+     printf("test output: %8d %8d %8d\n", box->burned, burn_contrast, box->diff);
+   }
+
    return(0);
 }
@@ -344 +369 @@
 /* burn_test() tests whether a box is burned or not */
 STATIC int burn_test(int nx, int ny, int NX, DTYPE *data, int rms,
-                       MTYPE *mask, OBJBOX *box)
+                       MTYPE *mask, OBJBOX *box, char *camera)
 {
    int i, j, n, nrow, nmed;