Changeset 13803 for trunk/psModules/src/objects/models/pmModel_QGAUSS.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/models/pmModel_QGAUSS.c (modified) (4 diffs)

trunk/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -127 +127 @@
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
             beta[nParam] = (beta[nParam] > 0) ? fabs(beta_lim) : -fabs(beta_lim);
-            psError(PM_ERR_PSF, true, "|beta[nParam==%d]| > |beta_lim|; %g v. %g",
-                    nParam, beta[nParam], beta_lim);
+            psTrace ("psModules.objects", 5, "|beta[nParam==%d]| > |beta_lim|; %g v. %g",
+                     nParam, beta[nParam], beta_lim);
             return false;
         }
@@ -163 +163 @@
         if (params[nParam] < params_min) {
             params[nParam] = params_min;
-            psError(PM_ERR_PSF, true, "params[nParam==%d] < params_min; %g v. %g",
-                    nParam, params[nParam], params_min);
+            psTrace ("psModules.objects", 5, "params[nParam==%d] < params_min; %g v. %g",
+                     nParam, params[nParam], params_min);
             return false;
         }
@@ -199 +199 @@
         if (params[nParam] > params_max) {
             params[nParam] = params_max;
-            psError(PM_ERR_PSF, true, "params[nParam==%d] > params_max; %g v. %g",
-                    nParam, params[nParam], params_max);
+            psTrace ("psModules.objects", 5, "params[nParam==%d] > params_max; %g v. %g",
+                     nParam, params[nParam], params_max);
             return false;
         }
@@ -372 +372 @@
             continue;
 
-        if (!PM_MODEL_LIMITS(PS_MINIMIZE_PARAM_MIN, i, out, NULL) ||
-            !PM_MODEL_LIMITS(PS_MINIMIZE_PARAM_MAX, i, out, NULL)) {
-            psError(PM_ERR_PSF, false, "Setting limits at (r,c) = (%.1f, %.1f)",
-                    in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
-            return false;
+        bool status = true;
+        status &= PM_MODEL_LIMITS(PS_MINIMIZE_PARAM_MIN, i, out, NULL);
+        status &= PM_MODEL_LIMITS(PS_MINIMIZE_PARAM_MAX, i, out, NULL);
+        if (!status) {
+            psTrace ("psModules.objects", 5, "Hitting parameter limits at (r,c) = (%.1f, %.1f)",
+                     in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            modelPSF->flags |= PM_MODEL_STATUS_LIMITS;
         }
     }
 
-    return(true);
+    return true;
 }