Changeset 21363 for trunk/psModules/src/objects/pmSourceSky.c

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psModules/src/objects/pmSourceSky.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourceSky.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-01-27 06:39:38 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 02:31:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -113 +113 @@
     psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
-    PS_ASSERT_IMAGE_NON_NULL(source->weight, false);
+    PS_ASSERT_IMAGE_NON_NULL(source->variance, false);
     PS_ASSERT_IMAGE_NON_NULL(source->maskObj, false);
     PS_ASSERT_PTR_NON_NULL(source->peak, false);
@@ -127 +127 @@
     }
 
-    psImage *image = source->weight;
+    psImage *image = source->variance;
     psImage *mask  = source->maskObj;
     pmPeak *peak  = source->peak;