Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/ppSub/src/ppSubLoop.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)
• ppSub (modified) (1 prop)
• ppSub/src/ppSubLoop.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/ppSub/src/ppSubLoop.c

@@ -23 +23 @@
 bool ppSubLoop(pmConfig *config)
 {
+    psAssert(config, "Require configuration.");
+
+    pmConfigCamerasCull(config, NULL);
+    pmConfigRecipesCull(config, "PPSUB,PPSTATS,PSPHOT,MASKS,JPEG");
+
     bool mdok;                          // Status of MD lookup
     const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); // Filename for statistics
@@ -59 +64 @@
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
-    pmHDU *lastHDU = NULL;              // Last HDU that was updated
 
     // Iterate over the FPA hierarchy
@@ -99 +103 @@
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                 return false;
-            }
-
-            // Put version information into the header
-            pmHDU *hdu = pmHDUFromCell(inCell);
-            if (hdu && hdu != lastHDU) {
-                if (!hdu->header) {
-                    hdu->header = psMetadataAlloc();
-                }
-                ppSubVersionMetadata(hdu->header);
-                lastHDU = hdu;
             }
 
@@ -183 +177 @@
     }
 
+    psString dump_file = psMetadataLookupStr(&mdok, config->arguments, "-dumpconfig");
+    if (dump_file) {
+
+        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
+        pmConfigDump(config, input->fpa, dump_file);
+    }
+
     return true;
 }