Changeset 13661

Timestamp:

Jun 5, 2007, 3:12:53 PM (19 years ago)

Author:

Paul Price

Message:

Merging pswarpDataLoad and pswarpDataSave into single function, pswarpLoop.

Location:

trunk/pswarp/src

Files:

• Makefile.am (modified) (1 diff)
• pswarp.c (modified) (1 diff)
• pswarp.h (modified) (3 diffs)
• pswarpDataLoad.c (deleted)
• pswarpDataSave.c (deleted)
• pswarpLoop.c (added)

trunk/pswarp/src/Makefile.am

@@ -7 +7 @@
         pswarpArguments.c               \
         pswarpCleanup.c                 \
-        pswarpDataLoad.c                \
-        pswarpDataSave.c                \
+        pswarpLoop.c                    \
         pswarpDefine.c                  \
         pswarpDefineSkycell.c           \

trunk/pswarp/src/pswarp.c

@@ -37 +37 @@
 
     // load and warp
-    if (!pswarpDataLoad (config)) {
-        psErrorStackPrint(stderr, "error reading input data\n");
-        exit (1);
-    }
-
-    // write out result image
-    if (!pswarpDataSave (config)) {
-        psErrorStackPrint(stderr, "error writing output data\n");
+    if (!pswarpLoop(config)) {
+        psErrorStackPrint(stderr, "error warping data\n");
         exit (1);
     }

trunk/pswarp/src/pswarp.h

@@ -14 +14 @@
 # define PSASTRO_RECIPE "PSASTRO" // Name of the recipe to use
 
-// a single pswarpMap converts coordinates from one image to a second image 
+// a single pswarpMap converts coordinates from one image to a second image
 // the linear model is only valid over a limited range of pixels
 typedef struct {
@@ -27 +27 @@
 typedef struct {
     pswarpMap ***maps;
-    int nXpts, nYpts;                   // number of x,y samples in the grid
-    int nXpix, nYpix;                   // x,y spacing in src image pixels of grid samples
-    int xMin,  yMin;                    // coordinate of first grid sample
+    int nXpts, nYpts;                   // number of x,y samples in the grid
+    int nXpix, nYpix;                   // x,y spacing in src image pixels of grid samples
+    int xMin,  yMin;                    // coordinate of first grid sample
 } pswarpMapGrid;
 
@@ -35 +35 @@
 bool pswarpParseCamera (pmConfig *config);
 bool pswarpDefine (pmConfig *config);
-bool pswarpDataLoad (pmConfig *config);
-bool pswarpDataSave (pmConfig *config);
+bool pswarpLoop (pmConfig *config);
 void pswarpCleanup (pmConfig *config);
 bool pswarpTransformReadout (pmReadout *output, pmReadout *input, pmConfig *config);