Changeset 13804 for trunk/psphot/src/psphotEvalPSF.c

Timestamp:

Jun 13, 2007, 2:00:08 PM (19 years ago)

Author:

eugene

Message:

replaced pmModel.status with pmModel.flags; using bit values instead of ints; names are now of the form PM_MODEL_STATUS_XXX; no error on limit saturation for model parameters

File:

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

trunk/psphot/src/psphotEvalPSF.c

@@ -67 +67 @@
     }
 
-    // did the model fit fail for one or another reason?
-    switch (model->status) {
-      case PM_MODEL_SUCCESS:
-        break;
-      case PM_MODEL_UNTRIED:
+    // was the model actually fitted?
+    if (!(model->flags & PM_MODEL_STATUS_FITTED)) {
         source->mode &= ~PM_SOURCE_MODE_FITTED; 
         if (source->mode & PM_SOURCE_MODE_SATSTAR) {
@@ -77 +74 @@
         }
         return false;
-      case PM_MODEL_BADARGS:
-      case PM_MODEL_NONCONVERGE:
-      case PM_MODEL_OFFIMAGE:
-      default:
+    }
+    // did the model fit fail for one or another reason?
+    if (model->flags & (PM_MODEL_STATUS_BADARGS | 
+                        PM_MODEL_STATUS_NONCONVERGE | 
+                        PM_MODEL_STATUS_OFFIMAGE)) {
         source->mode |= PM_SOURCE_MODE_FAIL;
         if (source->mode & PM_SOURCE_MODE_SATSTAR) {
@@ -193 +191 @@
     }
 
+    // was the model actually fitted?
+    if (!(model->flags & PM_MODEL_STATUS_FITTED)) {
+        source->mode &= ~PM_SOURCE_MODE_FITTED; 
+        return false;
+    }
     // did the model fit fail for one or another reason?
-    switch (model->status) {
-      case PM_MODEL_SUCCESS:
-        break;
-      case PM_MODEL_UNTRIED:
-        source->mode &= ~PM_SOURCE_MODE_FITTED; 
-        return false;
-      case PM_MODEL_BADARGS:
-      case PM_MODEL_NONCONVERGE:
-      case PM_MODEL_OFFIMAGE:
-      default:
+    if (model->flags & (PM_MODEL_STATUS_BADARGS | 
+                        PM_MODEL_STATUS_NONCONVERGE | 
+                        PM_MODEL_STATUS_OFFIMAGE)) {
         source->mode |= PM_SOURCE_MODE_FAIL;
         return false;