Changeset 41603 for branches/eam_branches/relphot.20210521/src/relphot_images.c

Timestamp:

May 21, 2021, 10:03:06 AM (5 years ago)

Author:

eugene

Message:

major revision of the photometric flat-field correction / grid analysis; strip out code which uses astrometric information to define the grid

File:

• branches/eam_branches/relphot.20210521/src/relphot_images.c (modified) (9 diffs)

branches/eam_branches/relphot.20210521/src/relphot_images.c

@@ -54 +54 @@
   FlatCorrectionTable *flatcorr = NULL;
 
+  initGridBins (); // allocates the empty array of corrections (elements are build below)
+
   if (CALIBRATE_STACKS_AND_WARPS || (NLOOP > 0)) {
     /* load catalog data from region files (hostID is 0 since we are not a client */
@@ -68 +70 @@
     initTGroupBins (catalog, Ncatalog);
 
-    initGridBins   (catalog, Ncatalog);
     initMrel (catalog, Ncatalog);
 
@@ -74 +75 @@
     MARKTIME("-- set up image indexes: %f sec\n", dtime);
 
-    findMosaics (catalog, Ncatalog, TRUE);  /* also sets Grid values */
+    findMosaics (catalog, Ncatalog, TRUE);
     MARKTIME("-- set up mosaic indexes: %f sec\n", dtime);
 
     findTGroups (catalog, Ncatalog);
     MARKTIME("-- set up mosaic indexes: %f sec\n", dtime);
+
+    initGrid (); // allocate grid correction entries for existing photcodes
 
     SAVEPLOT = FALSE;
@@ -91 +94 @@
     }
 
-    // if we are measuring the flat-field correction grid, we need to perform a number of iterations first:
-    if (USE_GRID) {
-      int star_toofew;
-
-      // until we finish the grid analysis, do not reject stars out-of-hand based on ID_OBJ_FEW
-      // XXX this is kind of poor: need to have a better distinctions about STAR_BAD in setMrel vs getMrel
-      star_toofew = STAR_TOOFEW;
-      STAR_TOOFEW = 0;
-      for (i = 0; i < NGRID; i++) {
-        STAR_BAD = ID_OBJ_POOR;
-        setMrel  (catalog, Ncatalog, flatcorr);
-        STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
-        setMgrid (catalog, flatcorr);
-      }
-      STAR_BAD  = ID_OBJ_POOR | ID_OBJ_FEW;
-      STAR_TOOFEW = star_toofew;
-    }
-
     /* determine fit values */
     for (i = 0; i < NLOOP; i++) {
@@ -119 +104 @@
       setMgrp  (catalog, flatcorr);
 
-      setMgrid (catalog, flatcorr);
+      setMgrid (catalog, Ncatalog);
       MARKTIME("-- set Mrel, Mcal, Mmos, Mgrid : %f sec\n", dtime);
     
       if (PLOTSTUFF) {
         plot_scatter (catalog, Ncatalog, flatcorr); 
-        plot_grid (catalog, flatcorr); 
         plot_mosaics ();
         plot_images ();
@@ -140 +124 @@
     if (PLOTSTUFF) {
       plot_scatter (catalog, Ncatalog, flatcorr); 
-      plot_grid (catalog, flatcorr); 
       plot_mosaics ();
       plot_images ();
@@ -147 +130 @@
     }
   
-    if (USE_GRID) dump_grid ();
+    // if (GRID_ZEROPT) dump_grid ();
 
     MARKTIME("-- finalize Mcal values: %f sec\n", dtime);
@@ -169 +152 @@
     freeMosaicBins (Ncatalog, TRUE);
     freeTGroupBins (Ncatalog);
-    freeGridBins (Ncatalog);
-
     // end of if (NLOOP > 0) block : this loop determines the offsets per chip 
   } else { 
@@ -205 +186 @@
   freeImages (db.ftable.buffer);
   freeMosaics ();
+  freeGridBins ();
+
   gfits_db_free (&db);