Changeset 20518

Timestamp:

Nov 3, 2008, 3:36:11 PM (18 years ago)

Author:

Paul Price

Message:

Don't use the subtraction mask when measuring the PSF, but the appropriate image mask.

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (4 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -338 +338 @@
 #endif
 
-    outRO->mask = (psImage*)psBinaryOp(outRO->mask, inConv->mask, "|", refConv->mask);
-    outRO->data_exists = outCell->data_exists = outCell->parent->data_exists = true; // It'll be there soon
-
     // Photometry is to be performed in two stages:
     // 1. Measure the PSF using the PSF-matched images
@@ -353 +350 @@
             outRO->weight = psImageCopy(outRO->weight, minuend->weight, PS_TYPE_F32);
         }
+        outRO->mask = psImageCopy(outRO->mask, minuend->mask, PS_TYPE_MASK);
 
         pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT");
@@ -409 +407 @@
         outRO->weight = (psImage*)psBinaryOp(outRO->weight, inConv->weight, "+", refConv->weight);
     }
+    outRO->mask = (psImage*)psBinaryOp(outRO->mask, inConv->mask, "|", refConv->mask);
+
     outRO->data_exists = outCell->data_exists = outCell->parent->data_exists = true;
 
@@ -434 +434 @@
     if (psMetadataLookupBool(&mdok, recipe, "RENORM")) {
         // Statistics for renormalisation
-        psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
+        psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe,
                                                                                 "RENORM.MEAN"));
-        psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
+        psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(NULL, recipe,
                                                                                  "RENORM.STDEV"));
         if (renormMean == PS_STAT_NONE || renormStdev == PS_STAT_NONE) {