Changeset 18612

Timestamp:

Jul 18, 2008, 10:31:30 AM (18 years ago)

Author:

Paul Price

Message:

Need to set the mask values for psphot.

Location:

trunk

Files:

• ppStack/src/ppStackPhotometry.c (modified) (1 diff)
• ppSub/src/ppSubReadout.c (modified) (1 diff)

trunk/ppStack/src/ppStackPhotometry.c

@@ -15 +15 @@
     pmFPACopy(photFile->fpa, readout->parent->parent->parent);
 
-    {
-        // Need to ensure aperture residual is not calculated
-        psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PSPHOT_RECIPE); // Recipe
-        psMetadataItem *item = psMetadataLookup(recipe, "MEASURE.APTREND"); // Item determining aptrend
-        if (!item) {
-            psWarning("Unable to find MEASURE.APTREND in psphot recipe");
-            psErrorClear();
-        } else {
-            item->data.B = false;
-        }
+    // Need to ensure aperture residual is not calculated
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PSPHOT_RECIPE); // Recipe
+    psMetadataItem *item = psMetadataLookup(recipe, "MEASURE.APTREND"); // Item determining aptrend
+    if (!item) {
+        psWarning("Unable to find MEASURE.APTREND in psphot recipe");
+        psErrorClear();
+    } else {
+        item->data.B = false;
     }
+
+    // set maskValue and markValue in the psphot recipe
+    psMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
+    psMaskType markValue = pmConfigMaskGet("MARK.VALUE", config); // Bits to use for marking
+    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "Bits to mask", maskValue);
+    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "Bits to use for mark", markValue);
 
     if (!psphotReadout(config, view)) {

trunk/ppSub/src/ppSubReadout.c

@@ -243 +243 @@
                          "ALTERED break point for psphot operations", "PSFMODEL");
 
+        // set maskValue and markValue in the psphot recipe
+        psMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
+        psMaskType markValue = pmConfigMaskGet("MARK.VALUE", config); // Bits to use for marking
+        psMetadataAddU8(recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "Bits to mask", maskValue);
+        psMetadataAddU8(recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "Bits to use for marking",
+                        markValue);
+
         if (!psphotReadout(config, view)) {
             psWarning("Unable to perform photometry on subtracted image.");