Changeset 23463

Timestamp:

Mar 20, 2009, 5:56:03 PM (17 years ago)

Author:

eugene

Message:

add ability to handle CTEMASK mode (combine like a flat; mask pixels below a minimum value; output a mask image)

Location:

trunk/ppMerge/src

Files:

• ppMerge.c (modified) (1 diff)
• ppMerge.h (modified) (1 diff)
• ppMergeArguments.c (modified) (3 diffs)
• ppMergeCamera.c (modified) (1 diff)
• ppMergeFiles.c (modified) (1 diff)
• ppMergeLoop.c (modified) (4 diffs)
• ppMergeScaleZero.c (modified) (1 diff)

trunk/ppMerge/src/ppMerge.c

@@ -55 +55 @@
       case PPMERGE_TYPE_FLAT:
       case PPMERGE_TYPE_FRINGE:
+      case PPMERGE_TYPE_CTEMASK:
         if (!ppMergeScaleZero(config)) {
             psErrorStackPrint(stderr, "Error getting scale and zero-points.");

trunk/ppMerge/src/ppMerge.h

@@ -40 +40 @@
     PPMERGE_TYPE_DARK,                  ///< (Multi-)Dark frame
     PPMERGE_TYPE_MASK,                  ///< Mask frame
+    PPMERGE_TYPE_CTEMASK,               ///< CTE Mask based on flat variance
     PPMERGE_TYPE_SHUTTER,               ///< Shutter frame
     PPMERGE_TYPE_FLAT,                  ///< Flat-field frame (dome or sky)

trunk/ppMerge/src/ppMergeArguments.c

@@ -170 +170 @@
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-fringe-ysmooth", 0, "Number of smoothing regions in y", 0);
 
+    /** CTEMASK construction parameters */
+    psMetadataAddF32(arguments, PS_LIST_TAIL, "-cte-min", 0, "min allowed value for good CTE", NAN);
+
     /** Shutter construction parameters */
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-shutter-size", 0, "Size for shutter measurement regions", 0);
@@ -268 +271 @@
       goto VALID;
     }
+    if (strcasecmp(typeStr, "CTEMASK") == 0) {
+      type = PPMERGE_TYPE_CTEMASK;
+      goto VALID;
+    }
     if (strcasecmp(typeStr, "MASK") == 0 ||
         strcasecmp(typeStr, "DARKMASK") == 0 ||
@@ -314 +321 @@
     VALUE_ARG_RECIPE_INT("-fringe-xsmooth", "FRINGE.XSMOOTH", S32, 0);
     VALUE_ARG_RECIPE_INT("-fringe-ysmooth", "FRINGE.YSMOOTH", S32, 0);
+
+    /** CTEMASK construction parameters */
+    VALUE_ARG_RECIPE_FLOAT("-cte-min",      "CTE.MIN",        F32);
 
     /** Shutter construction parameters */

trunk/ppMerge/src/ppMergeCamera.c

@@ -326 +326 @@
         fileType = PM_FPA_FILE_MASK;
         break;
+      case PPMERGE_TYPE_CTEMASK:
+        fileType = PM_FPA_FILE_MASK;
+        break;
       case PPMERGE_TYPE_SHUTTER:
         fileType = PM_FPA_FILE_IMAGE;

trunk/ppMerge/src/ppMergeFiles.c

@@ -209 +209 @@
         outSuffix = "MASK";
         break;
+      case PPMERGE_TYPE_CTEMASK:
+        outSuffix = "MASK";
+        break;
       case PPMERGE_TYPE_SHUTTER:
         outSuffix = "SHUTTER";

trunk/ppMerge/src/ppMergeLoop.c

@@ -118 +118 @@
       case PPMERGE_TYPE_BIAS:
       case PPMERGE_TYPE_DARK:
+      case PPMERGE_TYPE_CTEMASK:
         break;
       default:
@@ -208 +209 @@
             // call the init functions
             switch (type) {
+              case PPMERGE_TYPE_CTEMASK:
               case PPMERGE_TYPE_BIAS:
               case PPMERGE_TYPE_FLAT:
@@ -252 +254 @@
                 // Start a job
                 switch (type) {
+                  case PPMERGE_TYPE_CTEMASK:
                   case PPMERGE_TYPE_BIAS:
                   case PPMERGE_TYPE_FLAT:
@@ -408 +411 @@
             }
 
+            // calculate CTEMASK after stats so stats reflect median image
+            if (type == PPMERGE_TYPE_CTEMASK && outRO) {
+                // need to apply range cuts on the output image
+                psAssert (outRO->mask, "mask is not defined");
+                psAssert (outRO->mask->numCols == outRO->image->numCols, "mismatch between image and mask");
+                psAssert (outRO->mask->numRows == outRO->image->numRows, "mismatch between image and mask");
+
+                // CTEMASK parameters
+                float cteMin = psMetadataLookupF32(NULL, arguments, "CTE.MIN"); // Number of fringe points
+
+                char *cteMaskName = psMetadataLookupStr (&mdok, config->arguments, "MASK.SET.VALUE");
+                psImageMaskType cteMaskValue = pmConfigMaskGet(cteMaskName, config);
+
+                psF32 **outputImage = outRO->image->data.F32; 
+                psImageMaskType **outputMask = outRO->mask->data.PS_TYPE_IMAGE_MASK_DATA; 
+                for (int iy = 0; iy < outRO->image->numRows; iy++) {
+                    for (int ix = 0; ix < outRO->image->numCols; ix++) {
+                        if (outputImage[iy][ix] < cteMin) {
+                            outputMask[iy][ix] |= cteMaskValue;
+                        }
+                    }
+                }
+            }
+
             psFree(outRO);
             cellNum++;

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -35 +35 @@
       case PPMERGE_TYPE_BIAS:
       case PPMERGE_TYPE_DARK:
+      case PPMERGE_TYPE_CTEMASK:
         // Nothing to measure
         return true;