Changeset 7582

Timestamp:

Jun 15, 2006, 3:04:39 PM (20 years ago)

Author:

eugene

Message:

updating to reflect changes to pmFPAfile APIs

Location:

trunk/psphot/src

Files:

• . (modified) (1 prop)
• .cvsignore (modified) (1 diff)
• psphotImageLoop.c (modified) (3 diffs)
• psphotImageMedian.c (modified) (2 diffs)
• psphotParseCamera.c (modified) (3 diffs)

trunk/psphot/src

@@ -8 +8 @@
 psphot
 psphotTest
-errorCodes.c
 psphot.loT
 psphotErrorCodes.h

@@ -8 +8 @@
 psphot
 psphotTest
-errorCodes.c
 psphot.loT
 psphotErrorCodes.h

trunk/psphot/src/.cvsignore

@@ -8 +8 @@
 psphot
 psphotTest
-errorCodes.c
 psphot.loT
 psphotErrorCodes.h
-
 psphotErrorCodes.c

trunk/psphot/src/psphotImageLoop.c

@@ -18 +18 @@
     
     // files associated with the science image
-    if (!pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE)) {
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
         psFree(view);
         return false;
@@ -25 +25 @@
         psLogMsg ("psphot", 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) {
             psLogMsg ("psphot", 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; }
 
@@ -40 +40 @@
                 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);
         }
-        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/psphot/src/psphotImageMedian.c

@@ -56 +56 @@
     if (model == NULL) {
         // select model pixels, from output background model file, or create
-        model = pmFPAfileCreateInternal (config->files, "PSPHOT.BACKMDL", nx, ny, PS_TYPE_F32);
+        model = pmFPAfileDefineInternal (config->files, "PSPHOT.BACKMDL", nx, ny, PS_TYPE_F32);
     } else {
         // replace the supplied image data with an image of the desired size
@@ -109 +109 @@
     pmReadout *background = pmFPAfileThisReadout (config->files, view, "PSPHOT.BACKGND");
     if (background == NULL) {
-        background = pmFPAfileCreateInternal (config->files, "PSPHOT.BACKGND", Nx, Ny, PS_TYPE_F32);
+        background = pmFPAfileDefineInternal (config->files, "PSPHOT.BACKGND", Nx, Ny, PS_TYPE_F32);
     }
     psF32 **backData = background->image->data.F32;

trunk/psphot/src/psphotParseCamera.c

@@ -7 +7 @@
 
     // the input image defines the camera
-    pmFPAfile *input = pmFPAfileFromArgs (&status, config, "PSPHOT.INPUT", "INPUT");
+    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT", "INPUT");
     if (!status) {
         psError(PSPHOT_ERR_CONFIG, false, "Failed to build FPA from PSPHOT.INPUT");
@@ -27 +27 @@
 
     // these calls bind the I/O handle to the specified fpa
-    pmFPAfileDefine (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
+    pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
 
     // optionally save the residual image 
     if (psMetadataLookupBool(NULL, recipe, "SAVE.RESID")) {
-        pmFPAfileDefine (config->files, config->camera, input->fpa, "PSPHOT.RESID");
+        pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.RESID");
     }
 
@@ -41 +41 @@
     // optionally save the background model (small FITS image)
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKMDL")) {
-        pmFPAfileFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL");
+        pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL");
     }
     // optionally save the full background image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKGND")) {
-        pmFPAfileFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKGND");
+        pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKGND");
     }
     // optionally save the background-subtracted image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKSUB")) {
-        pmFPAfileFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKSUB");
+        pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKSUB");
     }
     // optionally save the PSF Model
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PSF")) {
-        pmFPAfileDefine (config->files, config->camera, input->fpa, "PSPHOT.PSF.SAVE");
+        pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.PSF.SAVE");
     }
     // optionally load the PSF Model
     if (psMetadataLookupBool(NULL, recipe, "LOAD.PSF")) {
-        pmFPAfileDefine (config->files, config->camera, input->fpa, "PSPHOT.PSF.LOAD");
+        pmFPAfileDefineInput (config->files, config->camera, input->fpa, "PSPHOT.PSF.LOAD");
     }
 

@@ -8 +8 @@
 psphot
 psphotTest
-errorCodes.c
 psphot.loT
 psphotErrorCodes.h