Changeset 7583

Timestamp:

Jun 15, 2006, 3:05:44 PM (20 years ago)

Author:

eugene

Message:

adding support for new pmFPAfile APIs

Location:

trunk/psastro/src

Files:

• psastroDataLoad.c (modified) (1 diff)
• psastroDataSave.c (modified) (1 diff)
• psastroParseCamera.c (modified) (2 diffs)

trunk/psastro/src/psastroDataLoad.c

@@ -34 +34 @@
 
     // files associated with the science image
-    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
         psTrace (__func__, 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-        pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+        pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
             psTrace (__func__, 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; }
 
                 psastroConvert (readout, recipe);
 
-                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);
         }
-        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);
     psFree (view);
     return true;

trunk/psastro/src/psastroDataSave.c

@@ -30 +30 @@
 
     // open/load files as needed
-    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
     while ((chip = pmFPAviewNextChip (view, output->fpa, 1)) != NULL) {
         psTrace (__func__, 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-        pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+        pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
 
         while ((cell = pmFPAviewNextCell (view, output->fpa, 1)) != NULL) {
             psTrace (__func__, 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, output->fpa, 1)) != NULL) {
-                pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+                pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
                 if (! readout->data_exists) { continue; }
 
-                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);
         }
-        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);
 
     psFree (view);

trunk/psastro/src/psastroParseCamera.c

@@ -7 +7 @@
 
     // the input image(s) are required arguments; they define the camera
-    pmFPAfile *input = pmFPAfileFromArgs (&status, config, "PSASTRO.INPUT", "INPUT");
+    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSASTRO.INPUT", "INPUT");
     if (!status) { psAbort (__func__, "missing INPUT entry"); }
 
@@ -20 +20 @@
 
     // these calls bind the I/O handle to the specified fpa
-    pmFPAfileDefine (config->files, config->camera, input->fpa, "PSASTRO.OUTPUT");
+    pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSASTRO.OUTPUT");
 
     // supply the output name (from cmd-line) to all output (WRITE) files