Changeset 30118 for branches/czw_branch/20101203/psphot/src/psphotMakeFluxScale.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotMakeFluxScale.c (modified) (1 diff, 1 prop)

branches/czw_branch/20101203/psphot/src/psphotMakeFluxScale.c

@@ -55 +55 @@
     fPts->n = Npts;
 
-    if (!pmTrend2DFit (trend, NULL, 0xff, xPts, yPts, fPts, NULL)) {
+    // XXX we should allow the spatial sampling to decrease if the fit fails
+    bool goodFit = false;
+    if (!pmTrend2DFit (&goodFit, trend, NULL, 0xff, xPts, yPts, fPts, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to fit trend");
+        success = false;
+        goto DONE;
+    }
+    if (!goodFit) {
+        psError(PS_ERR_UNKNOWN, false, "poor fit to flux-scale trend");
         success = false;
         goto DONE;