Index: trunk/psphot/src/psphot.c
===================================================================
--- trunk/psphot/src/psphot.c	(revision 4188)
+++ trunk/psphot/src/psphot.c	(revision 4189)
@@ -7,4 +7,6 @@
     psMetadata *header  = NULL;		// input image header
     psImage    *image   = NULL;		// input image data
+    psImage    *noise   = NULL;		// input image data
+    psImage    *mask    = NULL;		// input image data
     psArray    *sources = NULL;
     psArray    *peaks   = NULL;		// a list of pmPeaks 
@@ -14,8 +16,9 @@
     psLogArguments (&argc, argv);
     psTraceArguments (&argc, argv);
-    if (argc != 4) usage ();
+    config = load_args (&argc, argv);
 
     // load input data (image and config)
-    setup (&image, &header, &config, argv);
+    // create or load mask and noise images
+    setup (&image, &mask, &noise, &header, config);
 
     // measure image stats for initial guess 
@@ -58,10 +61,4 @@
 }
 
-int usage () {
-
-    fprintf (stderr, "USAGE: psphot (image.fits) (output.fits) (config)\n");
-    exit (2);
-}
-
 void dump_image (psImage *image, char *filename) {