Changeset 15588 for trunk/psModules/src/objects/pmSourceFitSet.c

Timestamp:

Nov 11, 2007, 11:49:52 AM (18 years ago)

Author:

eugene

Message:

removed over-zealous PS_ASSERTS

File:

• trunk/psModules/src/objects/pmSourceFitSet.c (modified) (6 diffs)

trunk/psModules/src/objects/pmSourceFitSet.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-11 21:49:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -119 +119 @@
 bool pmSourceFitSetJoin (psVector *deriv, psVector *param, pmSourceFitSetData *set)
 {
-    PS_ASSERT_PTR_NON_NULL(set, false);
-    PS_ASSERT_PTR_NON_NULL(param, false);
-
+    assert (set);
     assert (set->paramSet->n == set->derivSet->n);
 
@@ -132 +130 @@
         // one or the other (param or deriv) must be set
         assert ((deriv != NULL) || (param != NULL));
-        assert ((deriv == NULL) || (param == NULL) || (paramOne->n == derivOne->n));
+
+        // if we are setting derive, derivOne and paramOne must be same length
+        assert ((deriv == NULL) || (paramOne->n == derivOne->n));
         
         for (int j = 0; j < paramOne->n; j++, n++) {
@@ -147 +147 @@
 
 // distribute parameters from single param and deriv vectors into FitSet models
-bool pmSourceFitSetSplit (pmSourceFitSetData *set, const psVector *deriv, const psVector *param) {
-    PS_ASSERT_PTR_NON_NULL(set, false);
-    PS_ASSERT_PTR_NON_NULL(param, false);
-
+bool pmSourceFitSetSplit (pmSourceFitSetData *set, const psVector *deriv, const psVector *param) 
+{
+    assert (param);
+    assert (set);
     assert (set->paramSet->n == set->derivSet->n);
 
@@ -174 +174 @@
                            psMinimization *myMin, int nPix, bool fitStatus)
 {
-    PS_ASSERT_PTR_NON_NULL(set, false);
+    assert (set);
     bool onPic = true;
 
@@ -215 +215 @@
 psF32 pmSourceFitSetFunction(psVector *deriv, const psVector *param, const psVector *x)
 {
-    PS_ASSERT_PTR_NON_NULL(thisSet, NAN);
+    assert (thisSet);
     float chisqSum = 0.0;
     float chisqOne = 0.0;