Changeset 18513

Timestamp:

Jul 14, 2008, 2:44:27 PM (18 years ago)

Author:

eugene

Message:

rework to use new masking bit names

Location:

branches/eam_branch_20080706/pswarp/src

Files:

• Makefile.am (modified) (1 diff)
• pswarp.h (modified) (1 diff)
• pswarpArguments.c (modified) (2 diffs)
• pswarpLoop.c (modified) (2 diffs)
• pswarpParseCamera.c (modified) (1 diff)
• pswarpPixelFraction.c (modified) (2 diffs)
• pswarpSetMaskBits.c (added)
• pswarpTransformReadout_Opt.c (modified) (2 diffs)

branches/eam_branch_20080706/pswarp/src/Makefile.am

@@ -15 +15 @@
         pswarpParseCamera.c             \
         pswarpPixelFraction.c           \
+        pswarpSetMaskBits.c             \
         pswarpTransformReadout_Opt.c    \
         pswarpVersion.c            

branches/eam_branch_20080706/pswarp/src/pswarp.h

@@ -38 +38 @@
 pmConfig *pswarpArguments (int argc, char **argv);
 bool pswarpOptions(pmConfig *config);
+bool pswarpSetMaskBits (pmConfig *config);
 bool pswarpParseCamera (pmConfig *config);
 bool pswarpDefine (pmConfig *config);

branches/eam_branch_20080706/pswarp/src/pswarpArguments.c

@@ -109 +109 @@
     }
 
-    // Get mask parameters
-    psMaskType maskIn, maskPoor, maskBad; // Mask values for input, "poor" and "bad" pixels
-
-    psString maskNames = psMetadataLookupStr(&status, recipe, "MASK.IN");
-    if (!status) {
-        maskIn = 0x00;
-        psWarning("MASK.IN is not set in the %s recipe --- defaulting to %x.", PSWARP_RECIPE, maskIn);
-    }
-    maskIn = pmConfigMask(maskNames, config); // Mask for input data
-
-    maskNames = psMetadataLookupStr(&status, recipe, "MASK.POOR");
-    if (!status) {
-        maskPoor = 0x00;
-        psWarning("MASK.POOR is not set in the %s recipe --- defaulting to %x.", PSWARP_RECIPE, maskPoor);
-    }
-    maskPoor = pmConfigMask(maskNames, config); // Mask for "poor" warped data
-
-    maskNames = psMetadataLookupStr(&status, recipe, "MASK.BAD");
-    if (!status) {
-        maskBad = 0x00;
-        psWarning("MASK.BAD is not set in the %s recipe --- defaulting to %x.", PSWARP_RECIPE, maskBad);
-    }
-    maskBad = pmConfigMask(maskNames, config); // Mask for bad warped data
-
     float poorFrac = psMetadataLookupF32(&status, recipe, "POOR.FRAC"); // Frac of bad flux for a "poor"
     if (!status) {
@@ -152 +128 @@
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "INTERPOLATION.MODE", 0,
                      "Interpolation mode", interpolationMode);
-    psMetadataAddU8(config->arguments, PS_LIST_TAIL, "MASK.IN", 0,
-                    "Mask for input data", maskIn);
-    psMetadataAddU8(config->arguments, PS_LIST_TAIL, "MASK.POOR", 0,
-                    "Mask for poor warped data", maskPoor);
-    psMetadataAddU8(config->arguments, PS_LIST_TAIL, "MASK.BAD", 0,
-                    "Mask for bad warped data", maskBad);
     psMetadataAddF32(config->arguments, PS_LIST_TAIL, "POOR.FRAC", 0,
                      "Fraction of bad flux for a pixel to be marked as poor", poorFrac);

branches/eam_branch_20080706/pswarp/src/pswarpLoop.c

@@ -64 +64 @@
 bool pswarpLoop(pmConfig *config)
 {
-
-    psMaskType maskPoor = psMetadataLookupU8(NULL, config->arguments, "MASK.POOR"); // Mask for "poor" data
-    psMaskType maskBad = psMetadataLookupU8(NULL, config->arguments, "MASK.BAD"); // Mask for bad data
+    bool status; 
+
+    // load the recipe
+    psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, PSWARP_RECIPE);
+    if (!recipe) {
+        psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
+        return false;
+    }
+
+    // output mask bits
+    psMaskType maskValue = psMetadataLookupU8(&status, recipe, "MASK.OUTPUT"); 
+    psAssert (status, "MASK.OUTPUT was not defined");
 
     // select the input data sources
@@ -333 +342 @@
     // Perform statistics on the output image
     if (stats) {
-        if (!ppStatsFPA(stats, output->parent->parent->parent, view, maskBad | maskPoor, config)) {
+        if (!ppStatsFPA(stats, output->parent->parent->parent, view, maskValue, config)) {
             psWarning("Unable to perform statistics on warped image.");
         }

branches/eam_branch_20080706/pswarp/src/pswarpParseCamera.c

@@ -37 +37 @@
     if (!inMask) {
         psLogMsg ("pswarp", 3, "no mask supplied\n");
+    }
+    
+    // loading the mask here should have invoked pmConfigMaskReadHeader()
+    if (!pswarpSetMaskBits (config)) {
+        psError(PS_ERR_IO, false, "failed to set mask bits");
+        return NULL;
     }
 

branches/eam_branch_20080706/pswarp/src/pswarpPixelFraction.c

@@ -28 +28 @@
     PS_ASSERT_METADATA_NON_NULL(config->arguments, false);
 
+    bool status; 
+
     float minFrac = psMetadataLookupF32(NULL, config->arguments, "ACCEPT.FRAC"); // Minimum fraction
-    psMaskType maskPoor = psMetadataLookupU8(NULL, config->arguments, "MASK.POOR"); // Mask for "poor" data
-    psMaskType maskBad = psMetadataLookupU8(NULL, config->arguments, "MASK.BAD"); // Mask for bad data
-    psMaskType maskVal = maskPoor | maskBad; // Mask to apply
+
+    // load the recipe
+    psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
+    if (!recipe) {
+        psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
+        return false;
+    }
+
+    // output mask bits
+    psMaskType maskValue = psMetadataLookupU8(&status, recipe, "MASK.OUTPUT"); 
+    psAssert (status, "MASK.OUTPUT was not defined");
 
     psImage *image = readout->image;    // Image of interest
@@ -45 +55 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            if (mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal) {
+            if (mask->data.PS_TYPE_MASK_DATA[y][x] & maskValue) {
                 numBad++;
             } else {

branches/eam_branch_20080706/pswarp/src/pswarpTransformReadout_Opt.c

@@ -17 +17 @@
     psImageInterpolateMode interpolationMode = psMetadataLookupS32(NULL, config->arguments,
                                                                    "INTERPOLATION.MODE");
-    psMaskType maskIn = psMetadataLookupU8(NULL, config->arguments, "MASK.IN"); // Mask for input data
-    psMaskType maskPoor = psMetadataLookupU8(NULL, config->arguments, "MASK.POOR"); // Mask for "poor" data
-    psMaskType maskBad = psMetadataLookupU8(NULL, config->arguments, "MASK.BAD"); // Mask for bad data
+    // load the recipe
+    psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
+    if (!recipe) {
+        psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
+        return false;
+    }
+
+    // output mask bits
+    psMaskType maskIn   = psMetadataLookupU8(&mdok, recipe, "MASK.INPUT"); 
+    psMaskType maskPoor = pmConfigMaskGet("POOR.WARP", config); 
+    psMaskType maskBad  = pmConfigMaskGet("BAD.WARP", config); 
+    psAssert (mdok, "MASK.INPUT was not defined");
+
     float poorFrac = psMetadataLookupF32(NULL, config->arguments, "POOR.FRAC"); // Flux fraction for "poor"
 
@@ -62 +72 @@
 
     // Interpolation options
-    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(interpolationMode, inImage,
+    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(interpolationMode, inImage, 
                                                                        inVar, inMask, maskIn, NAN, NAN,
                                                                        maskBad, maskPoor, poorFrac);