Changeset 15562 for trunk/psModules/src/objects/pmPSF.c

Timestamp:

Nov 9, 2007, 3:09:20 PM (19 years ago)

Author:

eugene

Message:

updating all changes from from eam_branch_20071023

File:

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

trunk/psModules/src/objects/pmPSF.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-29 00:15:32 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-10 01:09:20 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -76 +76 @@
 }
 
+bool psMemCheckPSFOptions(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) pmPSFOptionsFree);
+}
+
 /*****************************************************************************
 pmPSFFree(psf): function to free a pmPSF structure
@@ -81 +87 @@
 static void pmPSFFree (pmPSF *psf)
 {
-
-    if (psf == NULL)
+    if (psf == NULL) {
         return;
+    }
 
     psFree (psf->ChiTrend);
@@ -98 +104 @@
  pmPSFAlloc (type): allocate a pmPSF.
 
- NOTE: PSF model parameters which are not modeled on an image are set to NULL in psf->params.
+ NOTE: PSF model parameters which are not modeled on an image are set to NULL
+ in psf->params.
 
  These are normally:
@@ -109 +116 @@
 pmPSF *pmPSFAlloc (pmPSFOptions *options)
 {
+    PS_ASSERT_PTR_NON_NULL(options, NULL);
     int Nparams;
 
@@ -205 +213 @@
 }
 
+bool psMemCheckPSF(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) pmPSFFree);
+}
+
 // the PSF models the \sigma_{xy} variation of the elliptical contour as a function of position in the image with a
 // polynomial.  an individual object has a contour of the form (x^2/2sx^2) + (y^2/2sy^2) + sxy*x*y
@@ -217 +231 @@
 double pmPSF_SXYfromModel (psF32 *modelPar)
 {
+    PS_ASSERT_PTR_NON_NULL(modelPar, NAN);
 
     double SXX = modelPar[PM_PAR_SXX];
@@ -229 +244 @@
 double pmPSF_SXYtoModel (psF32 *fittedPar)
 {
+    PS_ASSERT_PTR_NON_NULL(fittedPar, NAN);
 
     double SXX = fittedPar[PM_PAR_SXX];
@@ -247 +263 @@
 bool pmPSF_FitToModel (psF32 *fittedPar, float minMinorAxis)
 {
+    PS_ASSERT_PTR_NON_NULL(fittedPar, false);
+
     psEllipsePol pol;
 
@@ -272 +290 @@
 psEllipsePol pmPSF_ModelToFit (psF32 *modelPar)
 {
+//   XXX: must assert non-NULL input parameter
+//    PS_ASSERT_PTR_NON_NULL(modelPar, NAN);
+
     psEllipseShape shape;
 
@@ -289 +310 @@
     psEllipseShape shape;
     psEllipseAxes axes;
+//   XXX: must assert non-NULL input parameter
+//    PS_ASSERT_PTR_NON_NULL(modelPar, axes);
 
     shape.sx  = modelPar[PM_PAR_SXX] / M_SQRT2;
@@ -310 +333 @@
 bool pmPSF_AxesToModel (psF32 *modelPar, psEllipseAxes axes)
 {
+    PS_ASSERT_PTR_NON_NULL(modelPar, false);
+
     if ((axes.major <= 0) || (axes.minor <= 0)) {
         modelPar[PM_PAR_SXX] = 0.0;
@@ -374 +399 @@
 bool pmGrowthCurveGenerate (pmReadout *readout, pmPSF *psf, bool ignore, psMaskType maskVal, psMaskType mark)
 {
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+    PS_ASSERT_PTR_NON_NULL(readout->image, false);
 
     // bool status;