Changeset 15418 for branches/eam_branch_20071023/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Oct 29, 2007, 2:59:23 PM (19 years ago)

Author:

gusciora

Message:

Adding several changes to the objects directory. Most of these changes are
mere additions of PS_ASSERTs to the beginning of psModule functions to ensure
that input parameters are correct.

File:

• branches/eam_branch_20071023/psModules/src/objects/pmSourcePhotometry.c (modified) (14 diffs)

branches/eam_branch_20071023/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-29 03:14:55 $
+ *  @version $Revision: 1.36.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-30 00:59:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
 bool pmSourceMagnitudesInit (psMetadata *config)
 {
-
+    PS_ASSERT_PTR_NON_NULL(config, false);
     bool status;
 
@@ -64 +64 @@
 
 // XXX masked region should be (optionally) elliptical
-bool pmSourceMagnitudes (pmSource *source, pmPSF *psf, pmSourcePhotometryMode mode, psMaskType maskVal, psMaskType mark)
-{
+bool pmSourceMagnitudes (pmSource *source, pmPSF *psf, pmSourcePhotometryMode mode,
+                         psMaskType maskVal, psMaskType mark)
+{
+    PS_ASSERT_PTR_NON_NULL(source, false);
+    PS_ASSERT_PTR_NON_NULL(psf, false);
 
     int status = false;
@@ -269 +272 @@
 bool pmSourcePhotometryModel (float *fitMag, pmModel *model)
 {
+    PS_ASSERT_PTR_NON_NULL(fitMag, false);
+    if (model == NULL) {
+        return false;
+    }
 
     float fitSum = 0;
     *fitMag = NAN;
-
-    if (model == NULL) {
-        return false;
-    }
 
     // measure fitMag
@@ -289 +292 @@
 
 // return source aperture magnitude
-bool pmSourcePhotometryAper (float *apMag, pmModel *model, psImage *image, psImage *mask, psMaskType maskVal)
-{
+bool pmSourcePhotometryAper (float *apMag, pmModel *model, psImage *image, psImage *mask,
+                             psMaskType maskVal)
+{
+    PS_ASSERT_PTR_NON_NULL(apMag, false);
+    PS_ASSERT_PTR_NON_NULL(image, false);
+    PS_ASSERT_PTR_NON_NULL(mask, false);
+    PS_ASSERT_PTR_NON_NULL(model, false);
+
     float apSum = 0;
     float sky = 0;
     *apMag = NAN;
-
-    if (model == NULL) {
-        psError(PM_ERR_OBJECTS, true, "Model is NULL");
-        return false;
-    }
 
     if (DO_SKY) {
@@ -327 +331 @@
 
 // return source aperture magnitude
-bool pmSourcePixelWeight (float *pixWeight, pmModel *model, psImage *image, psImage *mask, psMaskType maskVal)
-{
+bool pmSourcePixelWeight (float *pixWeight, pmModel *model, psImage *image, psImage *mask,
+                          psMaskType maskVal)
+{
+    PS_ASSERT_PTR_NON_NULL(pixWeight, false);
+    PS_ASSERT_PTR_NON_NULL(image, false);
+    PS_ASSERT_PTR_NON_NULL(mask, false);
+    PS_ASSERT_PTR_NON_NULL(model, false);
+
     float modelSum = 0;
     float validSum = 0;
@@ -339 +349 @@
 
     *pixWeight = 0.0;
-
-    if (model == NULL)
-        return false;
 
     // we only care about the value of the object model, not the local sky
@@ -412 +419 @@
                              const bool unweighted_sum) // should the cross product be weighted?
 {
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
+    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
 
     int Xs, Xe, Ys, Ye;
@@ -475 +484 @@
                            const bool unweighted_sum) // should the cross product be weighted?
 {
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
+    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
 
     int Xs, Xe, Ys, Ye;
@@ -538 +549 @@
                       const bool unweighted_sum) // should the cross product be weighted?
 {
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
     double flux = 0, wt = 0, factor = 0;
 
@@ -587 +599 @@
 # endif
 
-bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *weight, psMaskType maskVal)
-{
+bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *weight,
+                    psMaskType maskVal)
+{
+    PS_ASSERT_PTR_NON_NULL(model, false);
+    PS_ASSERT_PTR_NON_NULL(image, false);
+    PS_ASSERT_PTR_NON_NULL(mask, false);
+    PS_ASSERT_PTR_NON_NULL(weight, false);
 
     double dC = 0.0;
@@ -613 +630 @@
                       const bool unweighted_sum) // should the cross product be weighted?
 {
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
     double flux = 0, wt = 0, factor = 0;
 
@@ -662 +680 @@
                               const bool unweighted_sum) // should the cross product be weighted?
 {
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
+    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
     int Xs, Xe, Ys, Ye;
     int xi, xj, yi, yj;
@@ -724 +744 @@
                              const bool unweighted_sum) // should the cross product be weighted?
 {
-
+    PS_ASSERT_PTR_NON_NULL(Mi, NAN);
+    PS_ASSERT_PTR_NON_NULL(Mj, NAN);
     int Xs, Xe, Ys, Ye;
     int xi, xj, yi, yj;