Changeset 6206

Timestamp:

Jan 26, 2006, 11:19:25 AM (20 years ago)

Author:

gusciora

Message:

misc bugs

Location:

trunk/psModules/src

Files:

• imcombine/pmReadoutCombine.c (modified) (3 diffs)
• objects/pmObjects.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-26 21:19:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -493 +493 @@
 Okay, they want to solve for source fluxes and chip gains.
  
- 
- 
- 
- 
- 
  *
  */
@@ -572 +567 @@
     psVectorRealloc(sourceFlux, numImages);
 
-
-
-
-
-
-    psFree(psVector);
+    //    psFree(psVector);
     if (numImages != chipGains->n) {
         psFree(localChipGains);
     }
+
+    return(true);
 }

trunk/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-12-24 01:24:32 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-26 21:19:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1308 +1308 @@
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
     PS_ASSERT_PTR_NON_NULL(source->peak, false);
-    PS_FLOAT_COMPARE(0.0, radius, false);
+    PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(radius, 0.0, false);
 
     //