Changeset 24470 for trunk/ppNoiseMap/src

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)
• Makefile.am (modified) (1 diff)
• ppNoiseMap.h (modified) (1 diff)
• ppNoiseMapLoop.c (modified) (3 diffs)
• ppNoiseMapParseCamera.c (modified) (2 diffs)
• ppNoiseMapReadout.c (added)
• ppNoiseMapStats.c (added)

trunk/ppNoiseMap/src/Makefile.am

@@ -36 +36 @@
         ppNoiseMapCleanup.c \
         ppNoiseMapVersion.c \
+        ppNoiseMapReadout.c \
+        ppNoiseMapStats.c \
         ppNoiseMapDefineFile.c
 

trunk/ppNoiseMap/src/ppNoiseMap.h

@@ -46 +46 @@
 void ppNoiseMapVersionPrint(void);
 
+/// perform the noise measurement
+bool ppNoiseMapReadout (pmConfig *config, pmFPAview *view);
+
+/// measure the noise for the readout
+bool ppNoiseMapStats(pmReadout *out, const pmReadout *in, psImageMaskType maskVal, int xBin, int yBin);
 #endif

trunk/ppNoiseMap/src/ppNoiseMapLoop.c

@@ -38 +38 @@
         }
 
+        // load all cells for this chip before generating output file fpa:
         pmCell *cell;                   // Cell from chip
         while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
@@ -70 +71 @@
                     continue;
                 }
+            }
+        }
 
-                // perform the noise analysis
-                // if (!ppNoiseMapReadout(config, view)) {
-                //     ESCAPE("Unable to detrend readout");
-                // }
-
+        if (!ppNoiseMapReadout(config, view)) {
+            ESCAPE("Unable to measure noise map for readout");
+        }
+        
+        // close the cells
+        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
+            if (!cell->process || !cell->file_exists) {
+                continue;
             }
-
-            // Close cell
             if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
                 ESCAPE("save failure for Cell");
@@ -90 +94 @@
     }
 
-    // if (psTraceGetLevel("ppNoiseMap") >= 3) {
-    //     ppNoiseMapFileCheck(config);
-    // }
-
     // Output and Close FPA
     if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {

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"));