Changeset 18430

Timestamp:

Jul 6, 2008, 6:23:02 PM (18 years ago)

Author:

eugene

Message:

set mask bits based on recipe and input mask image headers

Location:

branches/eam_branch_20080706

Files:

• ppImage/src/ppImageLoop.c (modified) (1 diff)
• ppImage/src/ppImageMetadataStats.c (modified) (1 diff)
• ppImage/src/ppImageMosaic.c (modified) (1 diff)
• ppImage/src/ppImageOptions.c (modified) (2 diffs)
• ppImage/src/ppImageParseCamera.c (modified) (4 diffs)
• ppImage/src/ppImagePixelStats.c (modified) (1 diff)
• ppImage/src/ppImageReplaceBackground.c (modified) (1 diff)
• ppImage/src/ppImageSetMaskBits.c (added)
• psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)
• psModules/src/config/pmConfigMask.c (modified) (3 diffs)

branches/eam_branch_20080706/ppImage/src/ppImageLoop.c

@@ -62 +62 @@
                     continue;
                 }
+
+                // XXX set the options->*Mask values here (after the mask images have been loaded
+                // and before any of the value are used)
+                ppImageSetMaskBits (config, options);
 
                 // perform the detrend analysis

branches/eam_branch_20080706/ppImage/src/ppImageMetadataStats.c

@@ -14 +14 @@
     }
 
+    // XXX should this be just options->maskValue?? I think so...
     psMaskType maskVal = options->satMask | options->badMask | options->maskValue;
 

branches/eam_branch_20080706/ppImage/src/ppImageMosaic.c

@@ -34 +34 @@
     // XXX mosaic the chip, making a deep copy.  this has the side effect of making the
     // output image products pure trimmed images, but also increases the memory footprint.
+    // XXX I think we should be using options->maskValue
     status = pmChipMosaic(outChip, inChip, true, options->blankMask);
     return status;

branches/eam_branch_20080706/ppImage/src/ppImageOptions.c

@@ -191 +191 @@
 
     // Mask recipe options
+    // XXX we cannot set these values here; wait until just before ppImageDetrend
     options->doMask = psMetadataLookupBool(NULL, recipe, "MASK");
+
+# if (0)    
     const char *masks = psMetadataLookupStr(&status, recipe, "MASK.VALUE");
     if (status) {
@@ -201 +204 @@
     options->blankMask = pmConfigMask("BLANK", config);
     // XXX should it be an error for these to not exist?
+# endif
 
     options->doBias = psMetadataLookupBool(NULL, recipe, "BIAS");

branches/eam_branch_20080706/ppImage/src/ppImageParseCamera.c

@@ -20 +20 @@
     }
 
-    // if MASK or WEIGHT was supplied on command line, bind files to 'input'
+    // if MASK or WEIGHT was supplied on command line, bind files to 'input'.
     // the mask and weight will be mosaicked with the image
     pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPIMAGE.INPUT.MASK", "PPIMAGE.INPUT.MASK");
@@ -27 +27 @@
         return NULL;
     }
-    if (inputMask && inputMask->type != PM_FPA_FILE_MASK) {
+    if (inputMask) {
+      if (inputMask->type != PM_FPA_FILE_MASK) {
         psError(PS_ERR_IO, true, "PPIMAGE.INPUT.MASK is not of type MASK");
         return NULL;
+      }
+      // XXX need to load the mask bit names from one of the headers
+      // this grabs the first available hdu : no guarantee that it will be valid, though
+      pmHDU *hdu = pmHDUGetFirst (inputMask->fpa);
+      if (!hdu) {
+        psError(PS_ERR_IO, true, "no valid HDU for PPIMAGE.INPUT.MASK");
+        return NULL;
+      }
+      if (!pmConfigMaskReadHeader (config, hdu->header)) {
+        psError(PS_ERR_IO, false, "error in mask bits");
+        return NULL;
+      }
     }
 
@@ -66 +79 @@
     }
     if (options->doMask) {
+
         if (!ppImageDefineFile (config, input->fpa, "PPIMAGE.MASK", "MASK", PM_FPA_FILE_MASK, PM_DETREND_TYPE_MASK)) {
             psError (PS_ERR_IO, false, "Can't find a mask image source");
@@ -71 +85 @@
             return NULL;
         }
-        // Need to read the names of bit masks from the mask header and set them in the recipe
+        // XXX have ppImageDefineFile return the pmFPAfile?
+        pmFPAfile *mask = psMetadataLookupPtr(&status, config->files, "PPIMAGE.MASK");
+        psAssert (mask, "mask not defined?  not possible!");
+
+        // Need to read the names of bit masks from the mask header and set them in the
+        // recipe.  If we are loading this from the detrend db, this action will happen
+        // when the file is resolved.
+        if (!mask->detrend) {
+            // XXX need to load the mask bit names from one of the headers
+            // this grabs the first available hdu : no guarantee that it will be valid, though
+            pmHDU *hdu = pmHDUGetFirst (mask->fpa);
+            if (!hdu) {
+                psError(PS_ERR_IO, true, "no valid HDU for PPIMAGE.INPUT.MASK");
+                return NULL;
+            }
+            // XXX is this consistent with the pmConfigMaskReadHeader call above?
+            if (!pmConfigMaskReadHeader (config, hdu->header)) {
+                psError(PS_ERR_IO, false, "error in mask bits");
+                return NULL;
+            }
+        }
     }
     if (options->doShutter) {

branches/eam_branch_20080706/ppImage/src/ppImagePixelStats.c

@@ -10 +10 @@
     bool mdok;              // Status of MD lookup
 
+    // XXX should this be just options->maskValue?? I think so...
     psMaskType maskVal = options->satMask | options->badMask | options->maskValue;
 

branches/eam_branch_20080706/ppImage/src/ppImageReplaceBackground.c

@@ -41 +41 @@
 
     // define the mask value to be used in ppImage
+    // XXX should this be just options->maskValue?? I think so...  (but it should certainly include flat!)
     psMaskType maskVal  = options->satMask | options->badMask | options->flatMask | options->blankMask;
 

branches/eam_branch_20080706/psModules/src/camera/pmFPAfileIO.c

@@ -792 +792 @@
           }
 
+          // XXX if we have a mask file, then we need to read the mask bit names
+          // defined for this file
+          if (file->type == PM_FPA_FILE_MASK) {
+            if (!pmConfigMaskReadHeader (config, phu)) {
+                psError(PS_ERR_IO, false, "error in mask bits");
+                return false;
+            }
+          }
+
           // determine the current format from the header
           // determine camera if not specified already

branches/eam_branch_20080706/psModules/src/config/pmConfigMask.c

@@ -40 +40 @@
 }
 
-// replace the named masks in the recipe with values in the header
+// replace the named masks in the recipe with values in the header:
+// replace only the names in the header in the recipe
 void pmConfigMasksReadHeader (pmConfig *config, psMetadata *header) {
 
@@ -49 +50 @@
     }
 
-    int nMask = 0;
+    int nMask = psMetadataLookupS32 (&status, header, "MSKNUM");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "Unable to find MSKNUM in header.");
+        return false;
+    }
 
-    psMetadataIterator *iter = psMetadataIteratorAlloc(recipe, PS_LIST_HEAD, NULL); // Iterator
+    for (int i = 0; i < nMask; i++) {
 
-    psMetadataItem *item;               // Item from iteration
-    while ((item = psMetadataGetAndIncrement(iter))) {
+        snprintf (namekey,  64, "MSKNAM%02d", i);
+        snprintf (valuekey, 64, "MSKVAL%02d", i);
 
-        if (item->type != PS_DATA_U8) {
-            psWarning("mask recipe entry %s is not a bit value\n", item->name);
-            continue;
+        char *name = psMetadataLookupStr (&status, header, namekey);
+        psU8 bit = psMetadataLookupU8 (&status, header, valuekey);
+
+        // XXX validate that bit is a 2^n value?
+
+        psMetadataItem *item = psMetadataLookup (header, name);
+        if (!item) {
+          psWarning("mask recipe entry %s not in recipe\n", name);
+          psMetadataAddU8 (recipe, PS_LIST_TAIL, name, 0, "Bitmask bit value", bit);
+        } else {
+          item->data.U8 = bit;
         }
-
-        snprintf (namekey,  64, "MSKNAM%02d", nMask);
-        snprintf (valuekey, 64, "MSKVAL%02d", nMask);
-
-        psMetadataAddStr (header, PS_LIST_TAIL, namekey, 0, "Bitmask bit name", item->name);
-        psMetadataAddU8 (header, PS_LIST_TAIL, valuekey, 0, "Bitmask bit value", item->data.U8);
-        nMask ++;
     }
     
-    psMetadataAddU8 (header, PS_LIST_TAIL, "MSKNUM", 0, "Bitmask bit count", nMask);
     return true;
 }
@@ -102 +107 @@
     }
     
-    psMetadataAddU8 (header, PS_LIST_TAIL, "MSKNUM", 0, "Bitmask bit count", nMask);
+    psMetadataAddS32 (header, PS_LIST_TAIL, "MSKNUM", 0, "Bitmask bit count", nMask);
     return true;
 }