Changeset 40235

Timestamp:

Dec 3, 2017, 5:56:10 AM (9 years ago)

Author:

eugene

Message:

move RESET for images out of select_images, up to load_images; fix plotting; add test output

Location:

branches/eam_branches/ohana.20170822/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ImageOps.c (modified) (1 diff)
• src/load_images.c (modified) (1 diff)
• src/plotstuff.c (modified) (1 diff)
• src/relphot_images.c (modified) (5 diffs)
• src/select_images.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/relphot/include/relphot.h

@@ -407 +407 @@
 int           findMosaics         PROTO((Catalog *catalog, int Ncatalog, int doMosaicList));
 
+void checkImages (char *name);
 int dumpMags (FILE *fout, Catalog *catalog, int Ncatalog);
 

branches/eam_branches/ohana.20170822/src/relphot/src/ImageOps.c

@@ -1159 +1159 @@
   return (stats);
 }
+
+void checkImages (char *name) {
+
+  off_t i;
+  fprintf (stderr, "--- %s ---\n", name);
+  for (i = 0; i < Nimage; i++) {
+    fprintf (stderr, "%s : 0x%08x : %6.3f  %6.3f\n", image[i].name, image[i].flags, image[i].McalPSF, image[i].McalAPER);
+  }
+}

branches/eam_branches/ohana.20170822/src/relphot/src/load_images.c

@@ -52 +52 @@
       free (subset);
       subset = image;
+    }
+  }
+
+  // reset image values as needed.  always allow 'few' images to succeed, if possible (new
+  // images / detections may have been added
+  for (off_t i = 0; i < Nsubset; i++) {
+    if (subset[i].flags & ID_IMAGE_PHOTOM_FEW) { 
+      subset[i].flags &= ~(ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_POOR);
+    }
+    if (RESET) {
+      if (RESET_ZEROPTS) {
+        if (!KEEP_UBERCAL || !(subset[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
+          subset[i].McalPSF  = 0.0;
+          subset[i].McalAPER = 0.0;
+          subset[i].dMcal    = NAN;
+          subset[i].flags   &= ~ID_IMAGE_PHOTOM_UBERCAL;
+        }
+      }
+      subset[i].flags &= ~ID_IMAGE_PHOTOM_POOR;
+      subset[i].ubercalDist = 1000;
     }
   }

branches/eam_branches/ohana.20170822/src/relphot/src/plotstuff.c

@@ -179 +179 @@
 
   KapaInitGraph (graphdata);
-  graphdata[0].style = 2;
+  graphdata[0].style = KAPA_PLOT_POINTS; /* points */
   graphdata[0].ptype = 2;
   graphdata[0].ltype = 0;

branches/eam_branches/ohana.20170822/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) */
@@ -60 +62 @@
     /* add in a loop over the catalogs calling dvo_catalog_chipcoords */
 
+    checkImages("load catalog");
+
     /* match measurements with images, mosaics */
     initImageBins  (catalog, Ncatalog, TRUE);
@@ -77 +81 @@
 
     setExclusions (catalog, Ncatalog, TRUE);
+    checkImages("set Exclu");
 
     global_stats (catalog, Ncatalog, flatcorr, 0);
@@ -109 +114 @@
       }
       if (VERBOSE2) dumpMags (stderr, catalog, Ncatalog);
+      checkImages("start loop");
 
       setMrel  (catalog, Ncatalog, flatcorr); // threaded
       if (VERBOSE2) dumpMags (stderr, catalog, Ncatalog);
+      checkImages("set Mrel");
 
       if (PLOTSTUFF) {
@@ -117 +124 @@
       }
       setMcal  (catalog, FALSE, flatcorr);
+      checkImages("set Mcal");
       if (VERBOSE2) dumpMags (stderr, catalog, Ncatalog);
 

branches/eam_branches/ohana.20170822/src/relphot/src/select_images.c

@@ -251 +251 @@
     image[nimage] = timage[i]; 
     inSubset[i] = TRUE;
-    /* always allow 'few' images to succeed, if possible (new images / detections may have
-     * been added) */
-    if (image[nimage].flags & ID_IMAGE_PHOTOM_FEW) { 
-      image[nimage].flags &= ~(ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_POOR);
-    }
-    if (RESET) {
-      if (RESET_ZEROPTS) {
-        if (!KEEP_UBERCAL || !(image[nimage].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
-          image[nimage].McalPSF  = 0.0;
-          image[nimage].McalAPER = 0.0;
-          image[nimage].dMcal    = NAN;
-          image[nimage].flags   &= ~ID_IMAGE_PHOTOM_UBERCAL;
-        }
-      }
-      image[nimage].flags &= ~ID_IMAGE_PHOTOM_POOR;
-      image[nimage].ubercalDist = 1000;
-    }
     line_number[nimage] = i;
     nimage ++;