Changeset 21366 for trunk/psphot/src/psphotMaskReadout.c

Timestamp:

Feb 5, 2009, 5:03:33 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/psphot/src/psphotMaskReadout.c (modified) (4 diffs)

trunk/psphot/src/psphotMaskReadout.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-// generate mask and weight if not defined, additional mask for restricted subregion 
-bool psphotSetMaskAndWeight (pmConfig *config, pmReadout *readout, psMetadata *recipe) {
+// generate mask and variance if not defined, additional mask for restricted subregion
+bool psphotSetMaskAndVariance (pmConfig *config, pmReadout *readout, psMetadata *recipe) {
 
     bool status;
@@ -15 +15 @@
     psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MASK.BAD", PS_META_REPLACE, "user-defined mask", maskBad);
 
-    // generate mask & weight images if they don't already exit
+    // generate mask & variance images if they don't already exit
     if (!readout->mask) {
         if (!pmReadoutGenerateMask(readout, maskSat, maskBad)) {
@@ -22 +22 @@
         }
     }
-    if (!readout->weight) {
-        if (!pmReadoutGenerateWeight(readout, true)) {
-            psError (PSPHOT_ERR_CONFIG, false, "trouble creating weight");
+    if (!readout->variance) {
+        if (!pmReadoutGenerateVariance(readout, true)) {
+            psError (PSPHOT_ERR_CONFIG, false, "trouble creating variance");
             return false;
         }
@@ -49 +49 @@
         psphotSaveImage (NULL, readout->image,  "image.fits");
         psphotSaveImage (NULL, readout->mask,   "mask.fits");
-        psphotSaveImage (NULL, readout->weight, "weight.fits");
+        psphotSaveImage (NULL, readout->variance, "variance.fits");
     }