Changeset 40246

Timestamp:

Dec 6, 2017, 5:55:50 AM (9 years ago)

Author:

eugene

Message:

enable -only-stacks-and-warps for relastro_parallel_regions

Location:

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

Files:

• launch_region_hosts.c (modified) (1 diff)
• liststats.c (modified) (5 diffs)
• relphot_images.c (modified) (6 diffs)
• relphot_parallel_images.c (modified) (3 diffs)
• setMrelCatalog.c (modified) (1 diff)

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

@@ -58 +58 @@
     strextend (&command, "-cloud-limit %f", CLOUD_TOLERANCE);
 
-    if (VERBOSE)             strextend (&command, "-v");
-    if (VERBOSE2)            strextend (&command, "-vv");
-    if (RESET)               strextend (&command, "-reset");
-    if (RESET_ZEROPTS)       strextend (&command, "-reset-zpts");
-    if (!KEEP_UBERCAL)       strextend (&command, "-reset-ubercal");
-    if (DophotSelect)        strextend (&command, "-dophot %d", DophotValue);
-    if (ImagSelect)          strextend (&command, "-instmag %f %f", ImagMin, ImagMax);
-    if (MaxDensityUse)       strextend (&command, "-max-density %f", MaxDensityValue);
-    if (SyntheticPhotometry) strextend (&command, "-synthphot");
-    if (USE_BASIC_CHECK)     strextend (&command, "-basic-image-search");
+    if (VERBOSE)                    strextend (&command, "-v");
+    if (VERBOSE2)                   strextend (&command, "-vv");
+    if (RESET)                      strextend (&command, "-reset");
+    if (RESET_ZEROPTS)              strextend (&command, "-reset-zpts");
+    if (!KEEP_UBERCAL)              strextend (&command, "-reset-ubercal");
+    if (DophotSelect)               strextend (&command, "-dophot %d", DophotValue);
+    if (ImagSelect)                 strextend (&command, "-instmag %f %f", ImagMin, ImagMax);
+    if (MaxDensityUse)              strextend (&command, "-max-density %f", MaxDensityValue);
+    if (SyntheticPhotometry)        strextend (&command, "-synthphot");
+    if (USE_BASIC_CHECK)            strextend (&command, "-basic-image-search");
 
-    if (UPDATE)              strextend (&command, "-update");
-    if (MOSAIC_ZEROPT)       strextend (&command, "-mosaic");
-    if (FREEZE_IMAGES)       strextend (&command, "-imfreeze");
-    if (FREEZE_MOSAICS)      strextend (&command, "-mosfreeze");
-    if (PARALLEL)            strextend (&command, "-parallel");
-    if (PARALLEL_MANUAL)     strextend (&command, "-parallel-manual");
-    if (PARALLEL_SERIAL)     strextend (&command, "-parallel-serial");
+    if (UPDATE)                     strextend (&command, "-update");
+    if (MOSAIC_ZEROPT)              strextend (&command, "-mosaic");
+    if (FREEZE_IMAGES)              strextend (&command, "-imfreeze");
+    if (FREEZE_MOSAICS)             strextend (&command, "-mosfreeze");
+    if (CALIBRATE_STACKS_AND_WARPS) strextend (&command, "-only-stacks-and-warps");
+
+    if (PARALLEL)                   strextend (&command, "-parallel");
+    if (PARALLEL_MANUAL)            strextend (&command, "-parallel-manual");
+    if (PARALLEL_SERIAL)            strextend (&command, "-parallel-serial");
 
     // XXX deprecate this if we are happy with the new version

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

@@ -194 +194 @@
 # define WEIGHT_THRESHOLD 0.3
 
-int fit_least_squares (double *fit, double *y, double *dy, double *wgt, double *wt, int Npts);
+int fit_least_squares (double *fit, double *err, double *y, double *dy, double *wgt, double *wt, int Npts);
 double VectorFractionInterpolate (double *values, float fraction, int Npts);
 double weight_cauchy (double x);
@@ -253 +253 @@
     
     double oldValue = value;
-    if (!fit_least_squares (&value, dataset->flxlist, dataset->errlist, dataset->wgtlist, dataset->wtvals, Npoints)) {
+    if (!fit_least_squares (&value, NULL, dataset->flxlist, dataset->errlist, dataset->wgtlist, dataset->wtvals, Npoints)) {
       value = oldValue;
       break;
@@ -330 +330 @@
     }
 
-    if (!fit_least_squares (&value, dataset->ysample, dataset->dysample, dataset->wtsample, NULL, Nkeep)) continue;
+    if (!fit_least_squares (&value, NULL, dataset->ysample, dataset->dysample, dataset->wtsample, NULL, Nkeep)) continue;
 
     dataset->bvalue[Nboot] = value;
@@ -342 +342 @@
   stats->error = (Shi - Slo) / 2.0;
 
+  // bootstrap can sometimes yield an excessively-optimistic result for the error.  Do not let
+  // the reported error be smaller than the formal error 
+  double errvalue;
+  if (fit_least_squares (&value, &errvalue, dataset->ykeep, dataset->dykeep, dataset->wtkeep, NULL, Nkeep)) {
+    stats->error = MAX (stats->error, errvalue);
+  }
+
   return TRUE;
 }
 
 // wgt is externally-supplied weight, wt is optional
-int fit_least_squares (double *fit, double *y, double *dy, double *wgt, double *wt, int Npts) { 
+int fit_least_squares (double *fit, double *err, double *y, double *dy, double *wgt, double *wt, int Npts) { 
 
   int i;
@@ -364 +371 @@
   }
   if (S0 == 0.0) return FALSE;
-  *fit = S1 / S0;
+  *fit = S1  / S0;
+  if (err) { *err = 1.0 / S0; }
   return TRUE;
 }

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

@@ -42 +42 @@
   MARKTIME("-- load images: %f sec\n", dtime);
 
-  checkImages("load images");
+  // checkImages("load images");
 
   /* unlock, if we can (else, unlocked below) */
@@ -48 +48 @@
 
   // load the flat correction table (if defined)
+  // we no longer need to do this: the flatcorrection is now saved in measure.Mflat
 # if (0)
   char flatcorrfile[256];
@@ -62 +63 @@
     /* add in a loop over the catalogs calling dvo_catalog_chipcoords */
 
-    checkImages("load catalog");
+    // checkImages("load catalog");
 
     /* match measurements with images, mosaics */
@@ -81 +82 @@
 
     setExclusions (catalog, Ncatalog, TRUE);
-    checkImages("set Exclu");
+    // checkImages("set Exclu");
 
     global_stats (catalog, Ncatalog, flatcorr, 0);
@@ -114 +115 @@
       }
       if (VERBOSE2) dumpMags (stderr, catalog, Ncatalog);
-      checkImages("start loop");
+      // checkImages("start loop");
 
       setMrel  (catalog, Ncatalog, flatcorr); // threaded
       if (VERBOSE2) dumpMags (stderr, catalog, Ncatalog);
-      checkImages("set Mrel");
+      // checkImages("set Mrel");
 
       if (PLOTSTUFF) {
@@ -124 +125 @@
       }
       setMcal  (catalog, FALSE, flatcorr);
-      checkImages("set Mcal");
+      // checkImages("set Mcal");
       if (VERBOSE2) dumpMags (stderr, catalog, Ncatalog);
 

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

@@ -36 +36 @@
   client_logger_message ("loaded images\n");
 
-  // once we have read this table, we should remove it for repeat runs
-  // unlink (IMAGE_TABLE); // XXX a bit risky, add some protection?
-
   makeMosaics (image, Nimage, TRUE);
 
@@ -44 +41 @@
 
   // load the flat correction table (if defined)
+  // we no longer need to do this: the flatcorrection is now saved in measure.Mflat
 # if (0)
   char flatcorrfile[256];
@@ -150 +148 @@
   client_logger_message ("all hosts are done the loops\n");
 
-  /* set Mcal & Mmos for bad images */
-  setMcal  (catalog, TRUE, flatcorr);
-  setMmos  (catalog, TRUE, flatcorr);
+  /* set Mcal & Mmos for bad images (for stack_and_warps, force images to be measured) */
+  int onlyPoorImages = !CALIBRATE_STACKS_AND_WARPS;
+  setMcal  (catalog, onlyPoorImages, flatcorr);
+  setMmos  (catalog, onlyPoorImages, flatcorr);
   MARKTIME("-- finalize Mcal values: %f sec\n", dtime);
 

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

@@ -569 +569 @@
 
     float psfQFbest = 0.0;
+    float SNbest = 0.0;
 
     off_t stackBestMeasure = -1;