Changeset 21363 for trunk/psModules/src/camera/pmHDU.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/camera/pmHDU.c (modified) (5 diffs)

trunk/psModules/src/camera/pmHDU.c

@@ -45 +45 @@
     psFree(hdu->header);
     psFree(hdu->images);
-    psFree(hdu->weights);
+    psFree(hdu->variances);
     psFree(hdu->masks);
 }
@@ -69 +69 @@
     hdu->header  = NULL;
     hdu->images  = NULL;
-    hdu->weights = NULL;
+    hdu->variances = NULL;
     hdu->masks   = NULL;
 
@@ -155 +155 @@
 }
 
-bool pmHDUReadWeight(pmHDU *hdu, psFits *fits)
-{
-    PS_ASSERT_PTR_NON_NULL(hdu, false);
-    PS_ASSERT_PTR_NON_NULL(fits, false);
-
-    return hduRead(hdu, &hdu->weights, fits);
+bool pmHDUReadVariance(pmHDU *hdu, psFits *fits)
+{
+    PS_ASSERT_PTR_NON_NULL(hdu, false);
+    PS_ASSERT_PTR_NON_NULL(fits, false);
+
+    return hduRead(hdu, &hdu->variances, fits);
 }
 
@@ -235 +235 @@
 }
 
-bool pmHDUWriteWeight(pmHDU *hdu, psFits *fits, const pmConfig *config)
+bool pmHDUWriteVariance(pmHDU *hdu, psFits *fits, const pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(hdu, false);
@@ -241 +241 @@
 
     psImageMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config); // Value to mask
-    return hduWrite(hdu, hdu->weights, hdu->masks, maskVal, fits);
+    return hduWrite(hdu, hdu->variances, hdu->masks, maskVal, fits);
 }