Changeset 7581 for trunk/ppImage/src/ppImagePhotom.c

Timestamp:

Jun 15, 2006, 3:03:49 PM (20 years ago)

Author:

eugene

Message:

substantial work on the image loop, support for DetDB

File:

• trunk/ppImage/src/ppImagePhotom.c (modified) (3 diffs)

trunk/ppImage/src/ppImagePhotom.c

@@ -29 +29 @@
         // mode is 'REFERENCE' to prevent double frees of the fpa
         pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PPIMAGE.OUTPUT");
-        input = pmFPAfileDefine (config->files, config->camera, output->fpa, "PSPHOT.INPUT");
+        input = pmFPAfileDefineInput (config->files, config->camera, output->fpa, "PSPHOT.INPUT");
         input->mode = PM_FPA_MODE_REFERENCE;
 
-        pmFPAfileDefine (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
+        pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
 
         // supply the output name (from cmd-line) to all output (WRITE) files
@@ -62 +62 @@
         psLogMsg ("ppImagePhot", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
         if (! cell->process || ! cell->file_exists) { continue; }
-        pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+        pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
         // process each of the readouts
         while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-            pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+            pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
             if (! readout->data_exists) { continue; }
 
@@ -72 +72 @@
             psphotReadout (config, view);
 
-            pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+            pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
         }
-        pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+        pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
     }