Changeset 13424

Timestamp:

May 18, 2007, 4:04:30 AM (19 years ago)

Author:

rhl

Message:

Check pmPSF_FitToModel's return code

Location:

trunk/psModules/src/objects/models

Files:

• pmModel_GAUSS.c (modified) (1 diff)
• pmModel_PGAUSS.c (modified) (1 diff)
• pmModel_QGAUSS.c (modified) (1 diff)

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

@@ -273 +273 @@
     // convert to shape terms (SXX,SYY,SXY)
     // XXX user-defined value for limit?
-    pmPSF_FitToModel (out, 0.1);
+    if (!pmPSF_FitToModel (out, 0.1)) {
+        psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)",
+                in[PM_PAR_YPOS], in[PM_PAR_XPOS]);
+        return false;
+    }
 
     // apply the model limits here: this truncates excessive extrapolation

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

@@ -293 +293 @@
     // the 2D PSF model fits polarization terms (E0,E1,E2)
     // convert to shape terms (SXX,SYY,SXY)
-    pmPSF_FitToModel (out, 0.1);
+    if (!pmPSF_FitToModel (out, 0.1)) {
+        psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)",
+                in[PM_PAR_YPOS], in[PM_PAR_XPOS]);
+        return false;
+    }
 
     // apply the model limits here: this truncates excessive extrapolation

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

@@ -350 +350 @@
     // the 2D PSF model fits polarization terms (E0,E1,E2)
     // convert to shape terms (SXX,SYY,SXY)
-    pmPSF_FitToModel (out, 0.1);
+    if (!pmPSF_FitToModel (out, 0.1)) {
+        psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)",
+                in[PM_PAR_YPOS], in[PM_PAR_XPOS]);
+        return false;
+    }
 
     // apply the model limits here: this truncates excessive extrapolation