Changeset 24470 for trunk/ppNoiseMap/src/ppNoiseMapParseCamera.c

Timestamp:

Jun 17, 2009, 8:39:13 PM (17 years ago)

Author:

eugene

Message:

updates to ppNoiseMap (now works)

Location:

trunk/ppNoiseMap/src

Files:

• . (modified) (1 prop)
• ppNoiseMapParseCamera.c (modified) (2 diffs)

trunk/ppNoiseMap/src/ppNoiseMapParseCamera.c

@@ -2 +2 @@
 
 bool ppNoiseMapParseCamera(pmConfig *config) {
+
+    bool status;
 
     if (!ppNoiseMapDefineFile(config, NULL, "PPNOISEMAP.INPUT", "INPUT", PM_FPA_FILE_IMAGE)) {
@@ -10 +12 @@
     psAssert(input, "We just put it there!");
 
-    // add recipe options supplied on command line
-    // bool status = false;
-    // psMetadata *recipe  = psMetadataLookupPtr(&status, config->recipes, RECIPE_NAME);
+    // the recipe is only fully parsed after the camera is first determined
+    psMetadata *recipe  = psMetadataLookupPtr(&status, config->recipes, RECIPE_NAME);
 
-    // the following files are output targets
-    pmFPAfile *outImage = pmFPAfileDefineOutput(config, input->fpa, "PPNOISEMAP.OUTPUT");
+    int xBin1 = psMetadataLookupS32(&status, recipe, "XBIN");
+    int yBin1 = psMetadataLookupS32(&status, recipe, "YBIN");
+
+    // this generates an output that maps to the same input pixels:
+    // pmFPAfile *outImage = pmFPAfileDefineOutput(config, input->fpa, "PPNOISEMAP.OUTPUT");
+
+    // this output results in new pixels with binning:
+    pmFPAfile *outImage = pmFPAfileDefineFromFPA(config, input->fpa, xBin1, yBin1, "PPNOISEMAP.OUTPUT");
+
     if (!outImage) {
         psError(PS_ERR_IO, false, _("Unable to generate output file from PPNOISEMAP.OUTPUT"));