Changeset 21363 for trunk/psModules/src/objects/pmSource.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/pmSource.c (modified) (14 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 01:09:50 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 02:31:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
     psFree(tmp->peak);
     psFree(tmp->pixels);
-    psFree(tmp->weight);
+    psFree(tmp->variance);
     psFree(tmp->maskObj);
     psFree(tmp->maskView);
@@ -66 +66 @@
 
     psFree (source->pixels);
-    psFree (source->weight);
+    psFree (source->variance);
     psFree (source->maskObj);
     psFree (source->maskView);
@@ -73 +73 @@
 
     source->pixels = NULL;
-    source->weight = NULL;
+    source->variance = NULL;
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -101 +101 @@
     source->peak = NULL;
     source->pixels = NULL;
-    source->weight = NULL;
+    source->variance = NULL;
     source->maskObj = NULL;
     source->maskView = NULL;
@@ -144 +144 @@
     }
     // this copy is used to allow multiple fit attempts on the
-    // same object.  the pixels, weight, and mask arrays all point to
+    // same object.  the pixels, variance, and mask arrays all point to
     // the same original subarrays.  the peak and moments point at
     // the original values.
@@ -167 +167 @@
     // We want a new view, but pointing at the same pixels.
     source->pixels   = psImageCopyView(NULL, in->pixels);
-    source->weight   = psImageCopyView(NULL, in->weight);
+    source->variance   = psImageCopyView(NULL, in->variance);
     source->maskView = in->maskView ? psImageCopyView(NULL, in->maskView) : NULL;
 
@@ -199 +199 @@
     // these images are subset images of the equivalent parents
     mySource->pixels = psImageSubset(readout->image, srcRegion);
-    if (readout->weight) {
-        mySource->weight = psImageSubset(readout->weight, srcRegion);
+    if (readout->variance) {
+        mySource->variance = psImageSubset(readout->variance, srcRegion);
     }
     if (readout->mask) {
@@ -237 +237 @@
 
     extend |= (mySource->pixels == NULL);
-    extend |= (mySource->weight == NULL);
+    extend |= (mySource->variance == NULL);
     extend |= (mySource->maskObj == NULL);
     extend |= (mySource->maskView == NULL);
@@ -245 +245 @@
         // re-create the subimage
         psFree (mySource->pixels);
-        psFree (mySource->weight);
+        psFree (mySource->variance);
         psFree (mySource->maskView);
 
         mySource->pixels   = psImageSubset(readout->image,  newRegion);
-        mySource->weight   = psImageSubset(readout->weight, newRegion);
+        mySource->variance   = psImageSubset(readout->variance, newRegion);
         mySource->maskView = psImageSubset(readout->mask,   newRegion);
         mySource->region   = newRegion;
@@ -670 +670 @@
     pmSource->peak
     pmSource->pixels
-    pmSource->weight
+    pmSource->variance
     pmSource->mask
 
@@ -737 +737 @@
 
         psF32 *vPix = source->pixels->data.F32[row];
-        psF32 *vWgt = source->weight->data.F32[row];
+        psF32 *vWgt = source->variance->data.F32[row];
         psImageMaskType *vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[row];
 
@@ -924 +924 @@
         if (mode & PM_MODEL_OP_NOISE) {
             // XXX need to scale by the gain...
-            target = source->weight->data.F32;
+            target = source->variance->data.F32;
         }
 
@@ -946 +946 @@
     psImage *target = source->pixels;
     if (mode & PM_MODEL_OP_NOISE) {
-        target = source->weight;
+        target = source->variance;
     }