Changeset 36169 for trunk/ppImage/src/ppImageParseCamera.c

Timestamp:

Oct 1, 2013, 10:25:29 AM (13 years ago)

Author:

bills

Message:

Rework of auxiliary masking. The initial implementation did not use the pmFPA system
because the files provided by MPG were not recognized as GPC1 and were not in a mask
format. This was the wrong thing to do.

1. Resolve auxiliary mask using pmFPA system
2. Use DETREND.CONSTRAINTS to select different set of masks for M31 and STS.
3. Convert the auxiliary video mask to type PS_TYPE_IMAGE_MASK
4. Change recipes for STS to use CHIP_AUXMASK recipe which uses det_type AUXMASK_STS
5. Change M31 recipes to use det_type AUXMASK_HEAVY

File:

• trunk/ppImage/src/ppImageParseCamera.c (modified) (1 diff)

trunk/ppImage/src/ppImageParseCamera.c

@@ -72 +72 @@
                                PM_FPA_FILE_MASK, PM_DETREND_TYPE_VIDEOMASK)) {
             psError(PS_ERR_IO, false, "Can't find a mask image source");
+            psFree(options);
+            return NULL;
+        }
+      }
+      if (options->doAuxMask) {
+        if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.AUXMASK", "MASK",
+                               PM_FPA_FILE_MASK, PM_DETREND_TYPE_AUXMASK)) {
+            psError(PS_ERR_IO, false, "Can't find a auxillary mask image source");
             psFree(options);
             return NULL;