Changeset 21211 for branches/pap_branch_20090128/psModules/src/imcombine/pmStack.c

Timestamp:

Jan 28, 2009, 2:33:51 PM (17 years ago)

Author:

Paul Price

Message:

Changing pmReadout.weight to variance. Adding pmReadout.covariance which will carry around a covariance pseudo-matrix, allowing us to calculate the pixel-to-pixel variance. pmReadout.covariance now exists and is set, but no mechanism yet to read/write, or use it.

File:

• branches/pap_branch_20090128/psModules/src/imcombine/pmStack.c (modified) (6 diffs)

branches/pap_branch_20090128/psModules/src/imcombine/pmStack.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-01-27 06:39:38 $
+ *  @version $Revision: 1.46.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-29 00:33:51 $
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
  *
@@ -263 +263 @@
 
         psImage *image = data->readout->image; // Image of interest
-        psImage *variance = data->readout->weight; // Variance ("weight") map of interest
+        psImage *variance = data->readout->variance; // Variance map of interest
         pixelData->data.F32[num] = image->data.F32[yIn][xIn];
         if (variance) {
@@ -442 +442 @@
     *numCols = data->readout->image->numCols;
     *numRows = data->readout->image->numRows;
-    if (data->readout->weight) {
+    if (data->readout->variance) {
         *haveVariances = true;
-        PS_ASSERT_IMAGE_NON_NULL(data->readout->weight, false);
-        PS_ASSERT_IMAGES_SIZE_EQUAL(data->readout->image, data->readout->weight, false);
-        PS_ASSERT_IMAGE_TYPE(data->readout->weight, PS_TYPE_F32, false);
+        PS_ASSERT_IMAGE_NON_NULL(data->readout->variance, false);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(data->readout->image, data->readout->variance, false);
+        PS_ASSERT_IMAGE_TYPE(data->readout->variance, PS_TYPE_F32, false);
     }
     *haveRejects = (data->reject != NULL);
@@ -473 +473 @@
         PS_ASSERT_IMAGES_SIZE_EQUAL(data->readout->image, data->readout->mask, false);
         if (*haveVariances) {
-            PS_ASSERT_IMAGE_NON_NULL(data->readout->weight, false);
-            PS_ASSERT_IMAGES_SIZE_EQUAL(data->readout->image, data->readout->weight, false);
-            PS_ASSERT_IMAGE_TYPE(data->readout->weight, PS_TYPE_F32, false);
+            PS_ASSERT_IMAGE_NON_NULL(data->readout->variance, false);
+            PS_ASSERT_IMAGES_SIZE_EQUAL(data->readout->image, data->readout->variance, false);
+            PS_ASSERT_IMAGE_TYPE(data->readout->variance, PS_TYPE_F32, false);
         }
     }
@@ -649 +649 @@
         psImage *combinedImage = combined->image; // Combined image
         psImage *combinedMask = combined->mask; // Combined mask
-        psImage *combinedVariance = combined->weight; // Combined variance map
+        psImage *combinedVariance = combined->variance; // Combined variance map
 
         psArray *pixelMap = pixelMapGenerate(input, minInputCols, maxInputCols,
@@ -702 +702 @@
         }
 
-        psImage *combinedVariance = combined->weight; // Combined variance map
+        psImage *combinedVariance = combined->variance; // Combined variance map
         if (haveVariances && !combinedVariance) {
-            combined->weight = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-            combinedVariance = combined->weight;
+            combined->variance = psImageAlloc(numCols, numRows, PS_TYPE_F32);
+            combinedVariance = combined->variance;
         }