Index: trunk/pswarp/src/pswarp.c
===================================================================
--- trunk/pswarp/src/pswarp.c	(revision 10832)
+++ trunk/pswarp/src/pswarp.c	(revision 10946)
@@ -19,5 +19,5 @@
 
     // load identify the data sources
-    if (!psastroParseCamera (config)) {
+    if (!pswarpParseCamera (config)) {
 	psErrorStackPrint(stderr, "error setting up the camera\n");
 	exit (1);
@@ -25,14 +25,23 @@
 
     // load the skycell layout information
-    pswarpDefine ();
+    if (!pswarpDefine (config)) {
+	psErrorStackPrint(stderr, "error loading output definition\n");
+	exit (1);
+    }
 
-    // warp loop 
-    pswarpProcess ();
+    // load and warp
+    if (!pswarpDataLoad (config)) {
+	psErrorStackPrint(stderr, "error reading input data\n");
+	exit (1);
+    }
     
     // write out result image
-    pswarpDataSave ();
+    if (!pswarpDataSave (config)) {
+	psErrorStackPrint(stderr, "error writing output data\n");
+	exit (1);
+    }
 
     psLogMsg ("pswarp", 3, "complete pswarp run: %f sec\n", psTimerMark ("complete"));
-    pswarpCleanup (config, refs);
+    pswarpCleanup (config);
     exit (EXIT_SUCCESS);
 }