Changeset 41556 for trunk/Ohana/src/relphot/src/relphot_images.c

Timestamp:

Apr 27, 2021, 8:39:17 AM (5 years ago)

Author:

eugene

Message:

updates to the good/bad night logic; save image stats

File:

• trunk/Ohana/src/relphot/src/relphot_images.c (modified) (6 diffs)

trunk/Ohana/src/relphot/src/relphot_images.c

@@ -41 +41 @@
   load_images (&db, skylist, &UserPatch, FALSE, USE_ALL_IMAGES);
   MARKTIME("-- load images: %f sec\n", dtime);
-
-  // checkImages("load images");
 
   /* unlock, if we can (else, unlocked below) */
@@ -63 +61 @@
     /* add in a loop over the catalogs calling dvo_catalog_chipcoords */
 
-    // checkImages("load catalog");
-
     /* match measurements with images, mosaics */
     initImageBins  (catalog, Ncatalog, TRUE);
@@ -87 +83 @@
 
     setExclusions (catalog, Ncatalog, TRUE);
-    // checkImages("set Exclu");
 
     global_stats (catalog, Ncatalog, flatcorr, 0);
@@ -118 +113 @@
       SetZptIteration (i);
 
-      dump_tgroups (catalog, i);
-      dump_catalog (catalog, 0, i); // for a test, just dump a specific catalog
-      dump_tgroup_imstats (i);
-
       setMrel  (catalog, Ncatalog, flatcorr); // threaded
-      setMcalTest (catalog, flatcorr);
-
-      dump_tgroups (catalog, i + 20);
-      dump_catalog (catalog, 0, i + 20); // for a test, just dump a specific catalog
-      dump_tgroup_imstats (i + 20);
-
-      setMcal  (catalog, FALSE, flatcorr);
-      setMmos  (catalog, FALSE, flatcorr);
-      setMgrp  (catalog, FALSE, flatcorr);
-      dump_tgroups (catalog, i + 40);
-      dump_catalog (catalog, 0, i + 40); // for a test, just dump a specific catalog
-      dump_tgroup_imstats (i + 40);
+
+      setMcal  (catalog, flatcorr);
+      setMmos  (catalog, flatcorr);
+      setMgrp  (catalog, flatcorr);
 
       setMgrid (catalog, flatcorr);
@@ -166 +149 @@
     if (USE_GRID) dump_grid ();
 
-    /* set Mcal & Mmos for bad images */
-    int onlyPoorImages = !CALIBRATE_STACKS_AND_WARPS;
-    onlyPoorImages = FALSE; // XXX deactivate for now
-    setMcal  (catalog, onlyPoorImages, flatcorr); // max loop since this is a final pass
-    setMmos  (catalog, onlyPoorImages, flatcorr); // max loop since this is a final pass
-    setMgrp  (catalog, onlyPoorImages, flatcorr); // max loop since this is a final pass
     MARKTIME("-- finalize Mcal values: %f sec\n", dtime);
 
@@ -177 +154 @@
     setMcalFromTGroups (); // copy per-tgroup calibrations to the images
 
-    if (SAVE_IMAGE_UPDATES) {
-
-      FITS_DB dbX;
-      off_t *LineNumber;
-      Image *image, *subset;
-      off_t Nimage, Nsubset, i, Nx;
-      char filename[1024];
-
-      gfits_db_init (&dbX);
-      dbX.lockstate = LCK_XCLD;
-      dbX.timeout   = 60.0;
-      dbX.mode      = db.mode;
-      dbX.format    = db.format;
-
-      snprintf (filename, 1024, "%s.bck", ImageCat);
-      if (!gfits_db_lock (&dbX, filename)) {
-        fprintf (stderr, "can't lock backup image image catalog\n");
-        return (FALSE);
-      }
-    
-      // apply the changes from the image subset to the full table:
-
-      // convert database table to internal structure (binary to Image)
-      // 'image' points to the same memory as db->ftable->buffer
-      image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
-      if (!image) {
-        fprintf (stderr, "ERROR: failed to read images\n");
-        exit (2);
-      }
-      gfits_scan (db.ftable.header, "NAXIS1", OFF_T_FMT, 1,  &Nx);
-
-      subset = getimages (&Nsubset, &LineNumber);
-      for (i = 0; i < Nsubset; i++) {
-        if (LineNumber[i] == -1) continue;
-        memcpy (&image[LineNumber[i]], &subset[i], Nx);
-      }
-
-      // copy Images.dat data (all or only the subset / vtable elements?)  I think I need to dump
-      // the entire Image table, but with the updates in place I think this says: re-work the
-      // ftable/vtable usage in this program to be more sensible...
-      gfits_copy_header (&db.header,  &dbX.header);
-      gfits_copy_matrix (&db.matrix,  &dbX.matrix);
-      gfits_copy_header (&db.theader, &dbX.theader);
-      gfits_copy_ftable (&db.ftable,  &dbX.ftable);
-
-      dbX.ftable.header = &dbX.theader;
-      dbX.virtual = FALSE;
-
-      // save Images.dat using the copied structure
-      if (UPDATE_CATFORMAT) {
-        // ensure the db format is updated
-        dbX.format = dvo_catalog_catformat (UPDATE_CATFORMAT);
-        gfits_modify (&dbX.header, "FORMAT", "%s", 1, UPDATE_CATFORMAT);
-
-        char photcodeFile[1024];
-        sprintf (photcodeFile, "%s/Photcodes.dat", CATDIR);
-        SavePhotcodesFITS (photcodeFile);
-      }
-      dvo_image_save (&dbX, VERBOSE);
-      dvo_image_unlock (&dbX); 
-      gfits_db_free (&dbX);
-      MARKTIME("-- save Image.dat.bck: %f sec\n", dtime);
-    }
+    // calculate and save per-chip residuals here:
+    MagResidSave ("mag.resid.fits", catalog);
+
+    save_images_updates (&db);
 
     /* at this point, we have correct cal coeffs in the image/mosaic structures */