Changeset 18909 for trunk/ppImage/src/ppImageLoop.c

Timestamp:

Aug 4, 2008, 5:47:15 PM (18 years ago)

Author:

Paul Price

Message:

Dump configuration.

File:

• trunk/ppImage/src/ppImageLoop.c (modified) (6 diffs)

trunk/ppImage/src/ppImageLoop.c

@@ -11 +11 @@
 }
 
-bool ppImageLoop (pmConfig *config, ppImageOptions *options) {
-
+bool ppImageLoop (pmConfig *config, ppImageOptions *options)
+{
     bool status;
     pmChip *chip;
@@ -27 +27 @@
         exit(PS_EXIT_PROG_ERROR);
     }
+
+#if 1
+    {
+        pmConfigCamerasCull(config);
+        pmConfigRecipesCull(config, "PPIMAGE,PPSTATS,PSPHOT,MASKS");
+
+        const char *outroot = psMetadataLookupStr(NULL, config->arguments, "OUTPUT"); // Output root name
+        psAssert(outroot, "Should be there, we put it there!");
+        pmConfigDump(config, input->fpa, outroot);
+    }
+#endif
 
     pmFPAview *view = pmFPAviewAlloc(0);// View for level of interest
@@ -63 +74 @@
                 }
 
-                // XXX set the options->*Mask values here (after the mask images have been loaded
-                // and before any of the value are used)
-                if (!ppImageSetMaskBits (config, options)) 
-                    ESCAPE ("Unable to set bit masks");
+                // XXX set the options->*Mask values here (after the mask images have been loaded
+                // and before any of the value are used)
+                if (!ppImageSetMaskBits (config, options))
+                    ESCAPE ("Unable to set bit masks");
 
                 // perform the detrend analysis
-                if (!ppImageDetrendReadout(config, options, view)) 
-                    ESCAPE ("Unable to detrend readout");
+                if (!ppImageDetrendReadout(config, options, view))
+                    ESCAPE ("Unable to detrend readout");
             }
         }
@@ -76 +87 @@
         // Apply the fringe correction
         if (options->doFringe) {
-            if (!ppImageDetrendFringeApply (config, chip, view, options)) 
-                ESCAPE ("Unable to defringe");
-        }
-        
-        // measure various statistics for this image
-        if (!ppImagePixelStats (config, options, view)) 
-            ESCAPE ("Unable to measures stats for image");
+            if (!ppImageDetrendFringeApply (config, chip, view, options))
+                ESCAPE ("Unable to defringe");
+        }
+
+        // measure various statistics for this image
+        if (!ppImagePixelStats (config, options, view))
+            ESCAPE ("Unable to measures stats for image");
 
         if (!ppImageMosaicChip(config, options, view, "PPIMAGE.CHIP", "PPIMAGE.OUTPUT"))
@@ -92 +103 @@
         }
 
-        // replace the masked pixels with the background level
-        if (options->replaceMasked) {
-            if (!ppImageReplaceBackground (config, view, options)) 
-                ESCAPE ("Unable to replace masked pixels with background level");
-        }
+        // replace the masked pixels with the background level
+        if (options->replaceMasked) {
+            if (!ppImageReplaceBackground (config, view, options))
+                ESCAPE ("Unable to replace masked pixels with background level");
+        }
 
-        // binning (used for display) must take place after the background is replaced, if desired
+        // binning (used for display) must take place after the background is replaced, if desired
         if (!ppImageRebinChip(config, view, options, "PPIMAGE.BIN1"))
             ESCAPE ("Unable to bin chip (level 1).");
@@ -129 +140 @@
 
     if (psTraceGetLevel("ppImage") >= 3) {
-        ppImageFileCheck (config);
+        ppImageFileCheck (config);
     }