Changeset 18924 for trunk/pswarp/src/pswarp.c

Timestamp:

Aug 5, 2008, 2:39:59 PM (18 years ago)

Author:

Paul Price

Message:

Adding configuration dumping. Required reorganisation of how recipe values get into the program. Formerly, the command-line and recipe values were parsed and the result was put on config->arguments. Now, we want whatever was altered by the command-line to be reflected in the recipe (which is dumped), so using the recipe as the storage. Not yet tested, but will do so soon.

File:

• trunk/pswarp/src/pswarp.c (modified) (5 diffs)

trunk/pswarp/src/pswarp.c

@@ -2 +2 @@
 
 static void usage (void) {
-    fprintf (stderr, "USAGE: pswarp [-file image(s)] [-list imagelist] [options] (output) (skycell)\n");
-    fprintf (stderr, "  options:\n");
-    fprintf (stderr, "    [-astrom astrom.cmp] : provide an alternative astrometry calibration\n");
-    fprintf (stderr, "    [-mask mask.fits] : provide a corresponding mask image\n");
-    fprintf (stderr, "    [-weight weight.fits] : provide a corresponding weight image (pixel varience)\n");
+    fprintf(stderr, "USAGE: pswarp [-file image(s)] [-list imagelist] [options] (output) (skycell)\n");
+    fprintf(stderr, "  options:\n");
+    fprintf(stderr, "    [-astrom astrom.cmp] : provide an alternative astrometry calibration\n");
+    fprintf(stderr, "    [-mask mask.fits] : provide a corresponding mask image\n");
+    fprintf(stderr, "    [-weight weight.fits] : provide a corresponding weight image (pixel varience)\n");
     psErrorStackPrint(stderr, "\n");
     exit (2);
@@ -24 +24 @@
     if (!config) usage();
 
-    if (!pswarpOptions(config)) {
-        psErrorStackPrint(stderr, "error parsing options\n");
-        exit(1);
-    }
-
     // load identify the data sources
     if (!pswarpParseCamera(config)) {
         psErrorStackPrint(stderr, "error setting up the camera\n");
-        exit (1);
+        exit(PS_EXIT_CONFIG_ERROR);
+    }
+
+    if (!pswarpOptions(config)) {
+        psErrorStackPrint(stderr, "error parsing options\n");
+        exit(PS_EXIT_SYS_ERROR);
     }
 
@@ -38 +38 @@
     if (!pswarpDefine(config)) {
         psErrorStackPrint(stderr, "error loading output definition\n");
-        exit (1);
+        exit(PS_EXIT_CONFIG_ERROR);
     }
 
@@ -44 +44 @@
     if (!pswarpLoop(config)) {
         psErrorStackPrint(stderr, "error warping data\n");
-        exit (1);
+        exit(PS_EXIT_DATA_ERROR);
     }
 
@@ -50 +50 @@
     pswarpCleanup(config);
     psLibFinalize();
-    exit(EXIT_SUCCESS);
+    exit(PS_EXIT_SUCCESS);
 }