Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageLoop.c

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppImage (modified) (1 prop)
• ppImage/src/ppImageLoop.c (modified) (7 diffs)

branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageLoop.c

@@ -25 +25 @@
     }
 
-    psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
-    if (dump_file) {
-        pmConfigCamerasCull(config, NULL);
-        pmConfigRecipesCull(config, "PPIMAGE,PPSTATS,PSPHOT,MASKS,PSASTRO");
-
-        pmConfigDump(config, input->fpa, dump_file);
-    }
+    pmConfigCamerasCull(config, NULL);
+    pmConfigRecipesCull(config, "PPIMAGE,PPSTATS,PSPHOT,MASKS,PSASTRO,JPEG");
 
     pmFPAview *view = pmFPAviewAlloc(0);// View for level of interest
@@ -63 +58 @@
 
             // Put version information into the header
-            pmHDU *hdu = pmHDUFromCell(cell);
+            pmHDU *hdu = pmHDUGetHighest(input->fpa, chip, cell);
             if (hdu && hdu != lastHDU) {
-                ppImageVersionMetadata(hdu->header);
+                ppImageVersionHeader(hdu->header);
                 lastHDU = hdu;
             }
@@ -96 +91 @@
                 }
 
-                // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
-                if (!ppImageDetrendFree (config, view)) {
-                    ESCAPE("Unable to free detrend images");
-                }
+                // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
+                if (!ppImageDetrendFree (config, view)) {
+                    ESCAPE("Unable to free detrend images");
+                }
             }
 
@@ -105 +100 @@
                 ppImageDetrendRecord(cell, config, options, view);
             }
-            // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
-            if (!ppImageDetrendFree (config, view)) {
-                ESCAPE("Unable to free detrend images");
-            }
-        }
-        // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
-        if (!ppImageDetrendFree (config, view)) {
-            ESCAPE("Unable to free detrend images");
-        }
+            // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
+            if (!ppImageDetrendFree (config, view)) {
+                ESCAPE("Unable to free detrend images");
+            }
+        }
+        // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
+        if (!ppImageDetrendFree (config, view)) {
+            ESCAPE("Unable to free detrend images");
+        }
 
         // Apply the fringe correction
@@ -121 +116 @@
             }
         }
-        // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
-        if (!ppImageFringeFree (config, view)) {
-            ESCAPE("Unable to free fringe images");
-        }
+        // free detrend images potentially in use: MASK, BIAS, DARK, SHUTTER, FLAT
+        if (!ppImageFringeFree (config, view)) {
+            ESCAPE("Unable to free fringe images");
+        }
 
         // measure various pixel-based statistics for this image
@@ -152 +147 @@
         }
 
-        // these may be used by ppImageSubtractBackground.
-        // if these are defined as internal files, drop them here
-        status = true;
-        status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
-        status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV");
-        status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
-        if (!status) {
-            psError(PSPHOT_ERR_PROG, false, "trouble dropping internal files");
-            psFree (view);
-            return false;
-        }
+        // these may be used by ppImageSubtractBackground.
+        // if these are defined as internal files, drop them here
+        status = true;
+        status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
+        status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV");
+        status &= pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
+        if (!status) {
+            psError(PSPHOT_ERR_PROG, false, "trouble dropping internal files");
+            psFree (view);
+            return false;
+        }
 
         // binning (used for display) must take place after the background is replaced, if desired
@@ -219 +214 @@
     }
     psFree(view);
+
+    // Dump configuration
+    psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
+    if (dump_file) {
+        pmConfigDump(config, input->fpa, dump_file);
+    }
 
     // Write out summary statistics