Changeset 25561 for branches/pap/psModules/src/imcombine/pmPSFEnvelope.c

Timestamp:

Sep 24, 2009, 3:09:08 PM (17 years ago)

Author:

Paul Price

Message:

Use strict limits on the model to throw out bad PSFs from the envelope calculation.

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
@@ -149 +151 @@
         }
 
+        // Test PSF
+        {
+            bool goodPSF = true;                                                                // Good PSF?
+            pmModel *model = pmModelFromPSFforXY(psf, numCols / 2.0, numRows / 2.0, PEAK_FLUX); // Test model
+            for (int j = 0; j < model->params->n && goodPSF; j++) {
+                if (!model->modelLimits(PS_MINIMIZE_PARAM_MIN, j, model->params->data.F32, NULL) ||
+                    !model->modelLimits(PS_MINIMIZE_PARAM_MAX, j, model->params->data.F32, NULL)) {
+                    goodPSF = false;
+                }
+            }
+            psFree(model);
+            if (!goodPSF) {
+                psWarning("PSF %d is bad --- not including in envelope calculation.", i);
+                continue;
+            }
+        }
+
         pmResiduals *resid = psf->residuals;// PSF residuals
         psf->residuals = NULL;