Changeset 13613

Timestamp:

Jun 4, 2007, 10:17:11 AM (19 years ago)

Author:

Paul Price

Message:

Mask is optional, created if not provided.

Location:

trunk/ppStack/src

Files:

• ppStackCamera.c (modified) (2 diffs)
• ppStackReadout.c (modified) (1 diff)

trunk/ppStack/src/ppStackCamera.c

@@ -35 +35 @@
 
         psString mask = psMetadataLookupStr(NULL, input, "MASK"); // Name of mask
-        if (!mask || strlen(mask) == 0) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Component %s lacks MASK of type STR", item->name);
-            psFree(iter);
-            return false;
-        }
 
         float seeing = psMetadataLookupF32(NULL, input, "SEEING"); // Seeing FWHM
@@ -80 +75 @@
         }
 
-        // Add the mask file
-        psArray *maskFiles = psArrayAlloc(1); // Array of filenames for this FPA
-        maskFiles->data[0] = psMemIncrRefCounter(mask);
-        psMetadataAddArray(config->arguments, PS_LIST_TAIL, "MASK.FILENAMES", PS_META_REPLACE,
-                           "Filenames of mask files", maskFiles);
-        psFree(maskFiles);
+        // Optionally add the mask file
+        if (mask && strlen(mask) > 0) {
+            psArray *maskFiles = psArrayAlloc(1); // Array of filenames for this FPA
+            maskFiles->data[0] = psMemIncrRefCounter(mask);
+            psMetadataAddArray(config->arguments, PS_LIST_TAIL, "MASK.FILENAMES", PS_META_REPLACE,
+                               "Filenames of mask files", maskFiles);
+            psFree(maskFiles);
 
-        bool status;
-        pmFPAfile *maskFile = pmFPAfileBindFromArgs(&status, imageFile, config, "PPSTACK.INPUT.MASK", "MASK.FILENAMES");
-        if (!status) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to define file from mask %d (%s)", i, mask);
-            return false;
-        }
-        if (maskFile->type != PM_FPA_FILE_MASK) {
-            psError(PS_ERR_IO, true, "PPSTACK.INPUT.MASK is not of type MASK");
-            return false;
+            bool status;
+            pmFPAfile *maskFile = pmFPAfileBindFromArgs(&status, imageFile, config, "PPSTACK.INPUT.MASK", "MASK.FILENAMES");
+            if (!status) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to define file from mask %d (%s)", i, mask);
+                return false;
+            }
+            if (maskFile->type != PM_FPA_FILE_MASK) {
+                psError(PS_ERR_IO, true, "PPSTACK.INPUT.MASK is not of type MASK");
+                return false;
+            }
         }
 

trunk/ppStack/src/ppStackReadout.c

@@ -80 +80 @@
         psArrayAdd(stack, ARRAY_BUFFER, data);
         psFree(data);                   // Drop reference
+
+        // Ensure there is a mask, or pmStackCombine will complain
+        if (!ro->mask) {
+            ro->mask = psImageAlloc(ro->image->numCols, ro->image->numRows, PS_TYPE_MASK);
+            psImageInit(ro->mask, 0);
+        }
+
         fileNum++;
     }