Changeset 15983

Timestamp:

Jan 2, 2008, 10:41:55 AM (18 years ago)

Author:

gusciora

Message:

Added code to do some PS_ASSERTS for input parameters.

File:

• trunk/psModules/src/objects/pmPSF.c (modified) (4 diffs)

trunk/psModules/src/objects/pmPSF.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-27 03:14:57 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-02 20:41:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -290 +290 @@
 psEllipsePol pmPSF_ModelToFit (psF32 *modelPar)
 {
-//   XXX: must assert non-NULL input parameter
-//    PS_ASSERT_PTR_NON_NULL(modelPar, NAN);
+    // must assert non-NULL input parameter
+    psEllipsePol pol;
+    pol.e0 = NAN;
+    pol.e1 = NAN;
+    pol.e2 = NAN;
+    PS_ASSERT_PTR_NON_NULL(modelPar, pol);
 
     psEllipseShape shape;
@@ -299 +303 @@
     shape.sxy = modelPar[PM_PAR_SXY];
 
-    psEllipsePol pol = psEllipseShapeToPol (shape);
+    pol = psEllipseShapeToPol (shape);
 
     return pol;
@@ -310 +314 @@
     psEllipseShape shape;
     psEllipseAxes axes;
+    axes.major = NAN;
+    axes.minor = NAN;
+    axes.theta = NAN;
 //   XXX: must assert non-NULL input parameter
-//    PS_ASSERT_PTR_NON_NULL(modelPar, axes);
+    PS_ASSERT_PTR_NON_NULL(modelPar, axes);
 
     shape.sx  = modelPar[PM_PAR_SXX] / M_SQRT2;