Changeset 36327 for branches/eam_branches/ipp-20130904/psphot/src/psphotSourceFits.c

Timestamp:

Nov 30, 2013, 1:35:54 PM (13 years ago)

Author:

eugene

Message:

add a number of additional flag bits, esp for model fitting

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotSourceFits.c (modified) (4 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotSourceFits.c

@@ -582 +582 @@
     maskVal |= markVal;
 
-    // allocate the model
+    // allocate the model (this can only fail on a config error)
     pmModel *model = pmModelAlloc(modelType);
-    if (!model) {
-        return NULL;
-    }
+    psAssert (model, "invalid extended model name");
 
     float t1, t2, t3, t4, t5;
@@ -622 +620 @@
         if (!psphotSersicModelGuessPCM (pcm, source, maskVal, psfSize)) {
             psFree (pcm);
-            model->flags |= PM_MODEL_STATUS_BADARGS;
+            model->flags |= PM_MODEL_SERSIC_PCM_FAIL_GUESS;
             return model;
         }
@@ -631 +629 @@
         if (!psphotFitSersicShapeAndIndexGridAuto (pcm, readout, source, &options, maskVal, markVal, psfSize)) {
             psFree (pcm);
-            model->flags |= PM_MODEL_STATUS_BADARGS;
+            model->flags |= PM_MODEL_SERSIC_PCM_FAIL_GRID;
             psError(PS_ERR_UNKNOWN, true, "Failed to find a index & shape");
             psErrorClear (); // clear the polynomial error
@@ -640 +638 @@
         if (!pmSourceModelGuessPCM (pcm, source, maskVal, markVal)) {
             psFree (pcm);
-            model->flags |= PM_MODEL_STATUS_BADARGS;
+            model->flags |= PM_MODEL_PCM_FAIL_GUESS;
             return model;
         }