Changeset 39344

Timestamp:

Feb 11, 2016, 11:33:44 AM (10 years ago)

Author:

eugene

Message:

report calibrated images

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ImageOps.c (modified) (4 diffs)
• src/global_stats.c (modified) (2 diffs)
• src/relphot_images.c (modified) (2 diffs)
• src/relphot_parallel_images.c (modified) (2 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -393 +393 @@
 Image        *getimages           PROTO((off_t *N, off_t **LineNumber));
 ImageSubset  *getimages_subset    PROTO((off_t *N));
-void          global_stats        PROTO((Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr));
+void          global_stats        PROTO((Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr, int nloop));
 void          initGrid            PROTO((int dX, int dY));
 void          initGridBins        PROTO((Catalog *catalog, int Ncatalog));

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -623 +623 @@
   Nfew = Nbad = Nmos = Ngrid = Nrel = Nsys = 0;
 
+  int Ncalibrated = 0;
   for (i = 0; i < Nimage; i++) {
     
@@ -631 +632 @@
     }      
 
+    // only freeze the gpc1 chips
     if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
 
@@ -729 +731 @@
     image[i].nFitPhotom = N;
     image[i].Xm    = 100.0*log10(stats.chisq);
+    Ncalibrated ++;
 
     if (PLOTSTUFF) {
@@ -752 +755 @@
   free (dMlist);
 
+  fprintf (stderr, "%d images calibrated\n", Ncalibrated);
   fprintf (stderr, "%d images marked having too few measurements (Nbad: %d, Nmos: %d, Ngrid: %d, Nrel: %d, Nsys: %d)\n", Nfew, Nbad, Nmos, Ngrid, Nrel, Nsys);
 

trunk/Ohana/src/relphot/src/global_stats.c

@@ -1 +1 @@
 # include "relphot.h"
 
-void global_stats (Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr) {
+void global_stats (Catalog *catalog, int Ncatalog, FlatCorrectionTable *flatcorr, int nloop) {
 
   StatType stN, stX, stS, imN, imX, imM, imD, msM, msX, msN, msD;
@@ -23 +23 @@
 
   int Ns;
-  for (Ns = 0; Ns < Nphotcodes; Ns++) {
+  for (Ns = 0; (nloop % 3 == 3) && (Ns < Nphotcodes); Ns++) {
 
     int thisCode = photcodes[Ns][0].code;

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

@@ -79 +79 @@
     setExclusions (catalog, Ncatalog, TRUE);
 
-    global_stats (catalog, Ncatalog, flatcorr);
+    global_stats (catalog, Ncatalog, flatcorr, 0);
 
     if (PLOTSTUFF) {
@@ -139 +139 @@
       if ((i > 8) && (i % 8 == 5)) clean_images ();
 
-      // if ((i == 1) || (i == 5) || (i ==  9) || (i == 13)) clean_measures (catalog, Ncatalog, FALSE); 
-      // if ((i == 2) || (i == 6) || (i == 10) || (i == 14)) clean_stars (catalog, Ncatalog);
-      // if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_mosaics ();
-      // if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_images ();
-      if (i % 3 == 2) global_stats (catalog, Ncatalog, flatcorr);
+      global_stats (catalog, Ncatalog, flatcorr, i);
       MARKTIME("-- finished loop %d: %f sec\n", i, dtime);
     }

trunk/Ohana/src/relphot/src/relphot_parallel_images.c

@@ -93 +93 @@
   setExclusions (catalog, Ncatalog, TRUE);
 
-  global_stats (catalog, Ncatalog, flatcorr);
+  global_stats (catalog, Ncatalog, flatcorr, 0);
 
   if (PLOTSTUFF) {
@@ -135 +135 @@
     if ((i > 8) && (i % 8 == 5)) clean_images ();
 
-    if (i % 3 == 2) global_stats (catalog, Ncatalog, flatcorr);
+    global_stats (catalog, Ncatalog, flatcorr, i);
     MARKTIME("-- finished loop %d: %f sec\n", i, dtime);
   }