Changeset 37940 for trunk/psphot

Timestamp:

Mar 3, 2015, 1:53:13 PM (11 years ago)

Author:

bills

Message:

If background modeling fails with PSPHOT_ERR_DATA add integer PSPHOT_QUALITY to readout->analysis.
psphotFullForce will use this to set quality value for the result. Other programs should be unaffected
except that error code will not be changed from PSPHOT_ERR_DATA previously the error code would
be PSPHOT_ERR_CONFIG

File:

• trunk/psphot/src/psphotModelBackground.c (modified) (3 diffs)

trunk/psphot/src/psphotModelBackground.c

@@ -277 +277 @@
         psFree(binning);
         psFree(rng);
+        psFree(dQ);
         return false;
     }
@@ -386 +387 @@
 
     if (!psphotModelBackgroundReadout(model->image, modelStdev->image, model->analysis, readout, binning, config, false)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to generate background model");
+        int lastError = psErrorCodeLast();
+        if (lastError == PSPHOT_ERR_DATA) {
+            // depending on context this value may or may not be used
+            psMetadataAddS32 (readout->analysis, PS_LIST_TAIL, "PSPHOT_QUALITY", PS_META_REPLACE, "quality error due to poor data", lastError);
+        }
+        psError(lastError, false, "Unable to generate background model");
         return false;
     }
@@ -404 +410 @@
     for (int i = 0; i < num; i++) {
         if (!psphotModelBackgroundReadoutFileIndex(config, view, filerule, i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to model background for %s entry %d", filerule, i);
+            int lastError = psErrorCodeLast();
+            psError (lastError ? lastError : PSPHOT_ERR_CONFIG, false, "failed to model background for %s entry %d", filerule, i);
             return false;
         }