Changeset 26878

Timestamp:

Feb 10, 2010, 4:20:05 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20091201/psphot/src

Files:

• psphotEfficiency.c (modified) (2 diffs)
• psphotModelBackground.c (modified) (3 diffs)
• psphotSourceSize.c (modified) (1 diff)

branches/eam_branches/20091201/psphot/src/psphotEfficiency.c

@@ -128 +128 @@
     psFree(rng);
 
+    bool oldThreads = pmReadoutFakeThreads(true); // Old threading status
+
     pmReadout *fakeRO = pmReadoutAlloc(NULL); // Fake readout
     if (!pmReadoutFakeFromVectors(fakeRO, numCols, numRows, xAll, yAll, magAll,
@@ -141 +143 @@
     psFree(xAll);
     psFree(yAll);
+
+    pmReadoutFakeThreads(oldThreads);
 
     psBinaryOp(ro->image, ro->image, "+", fakeRO->image);

branches/eam_branches/20091201/psphot/src/psphotModelBackground.c

@@ -152 +152 @@
     // XXXX we can thread this here by running blocks in parallel
 
+    int nFailures = 0;
+    psImageBackgroundInit();
+
     // measure clipped median for subimages
     psRegion ruffRegion = {0,0,0,0};
@@ -218 +221 @@
                 stats->options = PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV;
                 if (!psImageBackground(stats, &sample, subset, submask, maskVal, rng)) {
-                    // psLogMsg ("psphot", PS_LOG_WARN, "Failed to estimate background using ROBUST_MEDIAN for "
-                    //            "(%dx%d, (row0,col0) = (%d,%d)",
-                    //            subset->numRows, subset->numCols, subset->row0, subset->col0);
+                    if ((nFailures < 3) || (nFailures % 100 == 0)) {
+                        psLogMsg ("psphot", PS_LOG_WARN, "Failed to estimate background using ROBUST_MEDIAN for "
+                                  "(%dx%d, (row0,col0) = (%d,%d)",
+                                  subset->numRows, subset->numCols, subset->row0, subset->col0);
+                    }
+                    nFailures ++;
                     modelData[iy][ix] = modelStdevData[iy][ix] = NAN;
                 } else {
@@ -239 +245 @@
             psFree (submask);
         }
+    }
+
+    if (nFailures) {
+        psLogMsg ("psphot", PS_LOG_WARN, "Failed to estimate background for %d of %d subimages", nFailures, (model->numRows*model->numCols));
     }
 

branches/eam_branches/20091201/psphot/src/psphotSourceSize.c

@@ -194 +194 @@
     options->ApResid = stats->robustMedian;
     options->ApSysErr = psVectorSystematicError(dAp, ApErr, 0.05);
+    // XXX this is quite arbitrary...
+    if (!isfinite(options->ApSysErr)) options->ApSysErr = 0.01;
     psLogMsg ("psphot", PS_LOG_DETAIL, "psf - Sum: %f +/- %f\n", options->ApResid, options->ApSysErr);