Changeset 35118 for trunk/ppBackground/src

Timestamp:

Feb 7, 2013, 1:40:20 PM (13 years ago)

Author:

bills

Message:

Changes to the chip backround and warp background stages.
In chip background stage

Apply an auxillary mask selected for now from hard coded location.
Read input variance and include it in the output data products

In warp background stage

Read and write variance images
Get smf from alternate camRun. For now using a hard coded label
eventually from the warpBackgroundRun

Location:

trunk/ppBackground/src

Files:

• ppBackground.h (modified) (2 diffs)
• ppBackgroundArguments.c (modified) (3 diffs)
• ppBackgroundCamera.c (modified) (2 diffs)
• ppBackgroundData.c (modified) (2 diffs)
• ppBackgroundLoop.c (modified) (1 diff)
• ppBackgroundRestore.c (modified) (2 diffs)

trunk/ppBackground/src/ppBackground.h

@@ -13 +13 @@
     psString patternName;               // Filename of pattern
     psString backgroundName;            // Filename of background
-    psString imageName, maskName;       // Filenames of input image/mask
+    psString imageName;                 // Filenames of input image
+    psString maskName;                  // Filenames of input mask
+    psString varianceName;              // Filenames of input variance
+    psString auxMaskName;               // Filename of auxillary mask
     psString outRoot;                   // Output root name
     psMetadata *stats;                  // Statistics for output
@@ -52 +55 @@
     const pmChip *pattern,              // Chip with pattern
     const pmFPAview *view,              // View to data
-    pmConfig *config                    // Configuration
+    pmConfig *config,                   // Configuration
+    psImageMaskType maskBad             // value to use for bad pixels
     );
 

trunk/ppBackground/src/ppBackgroundArguments.c

@@ -49 +49 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-image", 0, "Filename of image (required)", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-mask", 0, "Filename of mask", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-variance", 0, "Filename of variance image", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-auxmask", 0, "Filename of auxiliary mask", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Output statistics file", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dumpconfig", 0, "Output configuration file", NULL);
@@ -59 +61 @@
     data->imageName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-image"));
     data->maskName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-mask"));
+    data->varianceName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-variance"));
+    data->auxMaskName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-auxmask"));
     data->outRoot = psStringCopy(argv[1]);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "OUTPUT", 0, "Output root name", data->outRoot);
@@ -64 +68 @@
     psTrace("ppBackground", 1, "Done reading command-line arguments\n");
 
-    if (!data->patternName && !data->backgroundName) {
-        psError(PPBACKGROUND_ERR_CONFIG, true, "Must specify at least one of -pattern and -background");
+    if (!data->patternName && !data->backgroundName && !data->auxMaskName) {
+        psError(PPBACKGROUND_ERR_CONFIG, true, "Must specify at least one of -pattern and -background -auxmask");
         return false;
     }

trunk/ppBackground/src/ppBackgroundCamera.c

@@ -65 +65 @@
     }
 
+    fileArguments("VARIANCE", data->varianceName, "Input uncorrected variance", data->config);
+    pmFPAfileBindFromArgs(&status, image, data->config, "PPBACKGROUND.VARIANCE", "VARIANCE"); // File
+    if (!status) {
+        psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.VARIANCE");
+        return false;
+    }
+
+    if (data->auxMaskName) {
+        fileArguments("AUXMASK", data->auxMaskName, "Auxiliary mask", data->config);
+        pmFPAfileBindFromArgs(&status, image, data->config, "PPBACKGROUND.AUXMASK", "AUXMASK"); // File
+        if (!status) {
+            psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.MASK");
+            return false;
+        }
+    }
+
     pmFPAfile *output = pmFPAfileDefineOutput(data->config, image->fpa, "PPBACKGROUND.OUTPUT");
     if (!output) {
@@ -79 +95 @@
     outMask->save = true;
 
+    pmFPAfile *outVariance = pmFPAfileDefineOutput(data->config, output->fpa, "PPBACKGROUND.OUTPUT.VARIANCE");
+    if (!outVariance) {
+        psError(psErrorCodeLast(), false, "Unable to define output.");
+        return false;
+    }
+    outVariance->save = true;
+
 #if 0
     // Now the camera has been determined, we can read the recipe

trunk/ppBackground/src/ppBackgroundData.c

@@ -17 +17 @@
     psFree(data->imageName);
     psFree(data->maskName);
+    psFree(data->varianceName);
+    psFree(data->auxMaskName);
     psFree(data->outRoot);
     psFree(data->stats);
@@ -33 +35 @@
     data->imageName = NULL;
     data->maskName = NULL;
+    data->varianceName = NULL;
+    data->auxMaskName = NULL;
     data->outRoot = NULL;
     data->stats = NULL;

trunk/ppBackground/src/ppBackgroundLoop.c

@@ -135 +135 @@
         pmChip *patternChip = patternFile ? pmFPAviewThisChip(view, patternMosaic) : NULL; // Chip with pattern
         pmChip *bgChip = bgFile ? pmFPAviewThisChip(view, bgFile->fpa) : NULL; // Chip with background model
-        if (!ppBackgroundRestore(chip, bgChip, patternChip, view, config)) {
+        if (!ppBackgroundRestore(chip, bgChip, patternChip, view, config, maskBad)) {
             psError(psErrorCodeLast(), false, "Unable to replace background");
             return false;

trunk/ppBackground/src/ppBackgroundRestore.c

@@ -35 +35 @@
 
 bool ppBackgroundRestore(pmChip *chip, const pmChip *background, const pmChip *pattern,
-                         const pmFPAview *oldView, pmConfig *config)
+                         const pmFPAview *oldView, pmConfig *config, psImageMaskType maskBad)
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
@@ -120 +120 @@
     }
 
+    psImage *auxMask = psMetadataLookupPtr(NULL, ro->analysis, "EXPNUM");
+    if (auxMask) {
+        if (auxMask->numCols != mask->numCols || auxMask->numRows != mask->numRows) {
+            psError(PPBACKGROUND_ERR_DATA, true, "auxiliary mask size (%d x %d) does not match input size (%d x %d)",
+                auxMask->numCols, auxMask->numRows, numCols, numRows);
+            return false;
+        }
+        // Arno's masks are floating point, fix later and zero means bad
+        #define AUXMASK_DATA F32
+        for (int y = 0; y < numRows; y++) {
+            for (int x = 0; x < numCols; x++) {
+                if (auxMask->data.AUXMASK_DATA[y][x] == 0) {
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskBad;
+                }
+            }
+        }
+    }
+
+
     ro->data_exists = true;
     ro->parent->data_exists = true;