Changeset 25565

Timestamp:

Sep 24, 2009, 4:12:50 PM (17 years ago)

Author:

Paul Price

Message:

pmModelFromPSFforXY involves using limits, so we need to ignore all
limits first, and then set the limits to 'strict'.

File:

• branches/pap/psModules/src/imcombine/pmPSFEnvelope.c (modified) (2 diffs)

branches/pap/psModules/src/imcombine/pmPSFEnvelope.c

@@ -110 +110 @@
         }
     }
-
-    pmModelClassSetLimits(PM_MODEL_LIMITS_STRICT);
 
     // Generate fake images with each PSF, and take the envelope
@@ -154 +152 @@
         {
             bool goodPSF = true;                                                                // Good PSF?
+            pmModelClassSetLimits(PM_MODEL_LIMITS_IGNORE);
             pmModel *model = pmModelFromPSFforXY(psf, numCols / 2.0, numRows / 2.0, PEAK_FLUX); // Test model
+            model->modelSetLimits(PM_MODEL_LIMITS_STRICT);
             for (int j = 0; j < model->params->n && goodPSF; j++) {
                 if (!model->modelLimits(PS_MINIMIZE_PARAM_MIN, j, model->params->data.F32, NULL) ||