Changeset 35512 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpCleanup.c

Timestamp:

May 5, 2013, 2:20:46 PM (13 years ago)

Author:

eugene

Message:

stats is basically working now

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpCleanup.c (modified) (2 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpCleanup.c

@@ -18 +18 @@
 
     // Ensure everything is written out, at every level
-    pswarpFileActivation(config, detectorFiles, true);
+    pswarpFileActivation(config, detectorFiles, false);
+    pswarpFileActivation(config, photFiles, false);
+    pswarpFileActivation(config, independentFiles, false);
     pswarpFileActivation(config, skycellFiles, true);
-    pswarpFileActivation(config, photFiles, true);
-    pswarpFileActivation(config, independentFiles, true);
 
-    if (!pswarpIOChecksAfter(config)) {
+    pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PSWARP.OUTPUT");
+    if (!output) {
+        psError(PSWARP_ERR_CONFIG, false, "Can't find output data!\n");
+        pmFPAfileFreeSetStrict(false);
+        goto DONE;
+    }
+
+    pmFPAview *view = pmFPAviewAlloc(0);
+    if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+        psError(psErrorCodeLast(), false, "Unable to read files.");
+        pmFPAfileFreeSetStrict(false);
+        goto DONE;
+    }
+    pmChip *chip;
+    while ((chip = pmFPAviewNextChip (view, output->fpa, 1)) != NULL) {
+        psTrace ("pswarp", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+        if (!chip->process || !chip->file_exists) { continue; }
+        if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+            psError(psErrorCodeLast(), false, "Unable to read files.");
+            pmFPAfileFreeSetStrict(false);
+            goto DONE;
+        }
+        pmCell *cell;
+        while ((cell = pmFPAviewNextCell (view, output->fpa, 1)) != NULL) {
+            psTrace ("pswarp", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+            if (!cell->process || !cell->file_exists) { continue; }
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE) ||
+                !pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
+                psError(psErrorCodeLast(), false, "Unable to read files.");
+                pmFPAfileFreeSetStrict(false);
+                goto DONE;
+            }
+        }
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
+            psError(psErrorCodeLast(), false, "Unable to write files.");
+            pmFPAfileFreeSetStrict(false);
+            goto DONE;
+        }
+    }
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
         psError(psErrorCodeLast(), false, "Unable to write files.");
-        exitValue = pswarpExitCode(exitValue);
         pmFPAfileFreeSetStrict(false);
+        goto DONE;
     }
+    psFree(view);
 
     if (!pswarpStatsFileSave (config, statsFile)) {
@@ -56 +96 @@
     psLibFinalize();
 
+DONE:
     exitValue = pswarpExitCode(exitValue);
     exit (exitValue);