Changeset 13803 for trunk/psModules/src/objects/pmSourceFitModel.c

Timestamp:

Jun 13, 2007, 1:41:51 PM (19 years ago)

Author:

magnier

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/psModules/src/objects/pmSourceFitModel.c (modified) (8 diffs)

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-26 01:20:29 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-13 23:41:51 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -157 +157 @@
     if (nPix <  nParams + 1) {
         psTrace ("psModules.objects", 4, "insufficient valid pixels\n");
-        model->status = PM_MODEL_BADARGS;
+        model->flags |= PM_MODEL_STATUS_BADARGS;
         psFree (x);
         psFree (y);
@@ -184 +184 @@
     model->nIter = myMin->iter;
     model->nDOF  = y->n - nParams;
+    model->flags |= PM_MODEL_STATUS_FITTED;
+    if (!fitStatus) model->flags |= PM_MODEL_STATUS_NONCONVERGE;
 
     // get the Gauss-Newton distance for fixed model parameters
@@ -207 +209 @@
     }
 
-    // set the model success or failure status
-    if (!fitStatus) {
-        model->status = PM_MODEL_NONCONVERGE;
-    } else {
-        model->status = PM_MODEL_SUCCESS;
-    }
-
     // models can go insane: reject these
     onPic &= (params->data.F32[PM_PAR_XPOS] >= source->pixels->col0);
@@ -220 +215 @@
     onPic &= (params->data.F32[PM_PAR_YPOS] <  source->pixels->row0 + source->pixels->numRows);
     if (!onPic) {
-        model->status = PM_MODEL_OFFIMAGE;
+        model->flags |= PM_MODEL_STATUS_OFFIMAGE;
     }
 
@@ -461 +456 @@
         psTrace (__func__, 4, "insufficient valid pixels\n");
         psTrace("psModules.objects", 3, "---- %s() end : fail pixels ----\n", __func__);
-        model->status = PM_MODEL_BADARGS;
+        model->flags |= PM_MODEL_STATUS_BADARGS;
         psFree (x);
         psFree (y);
@@ -529 +524 @@
 
         // set the model success or failure status
-        model->status = fitStatus ? PM_MODEL_SUCCESS : PM_MODEL_NONCONVERGE;
+        model->flags |= PM_MODEL_STATUS_FITTED;
+        if (!fitStatus) model->flags |= PM_MODEL_STATUS_NONCONVERGE;
 
         // models can go insane: reject these
@@ -536 +532 @@
         onPic &= (model->params->data.F32[PM_PAR_XPOS] >= source->pixels->row0);
         onPic &= (model->params->data.F32[PM_PAR_XPOS] <  source->pixels->row0 + source->pixels->numRows);
-        if (!onPic) {
-            model->status = PM_MODEL_OFFIMAGE;
-        }
+        if (!onPic) model->flags |= PM_MODEL_STATUS_OFFIMAGE;
     }
     psTrace ("psModules.objects", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);