Index: trunk/psastro/src/psastro.c
===================================================================
--- trunk/psastro/src/psastro.c	(revision 5560)
+++ trunk/psastro/src/psastro.c	(revision 6791)
@@ -3,11 +3,16 @@
 int main (int argc, char **argv) {
 
+    psTimerStart ("complete");
+
     psMetadata *header = NULL;
 
     // load configuration information
-    psMetadata *config = psastroArguments (&argc, argv);
+    pmConfig *config = psastroArguments (&argc, argv);
 
-    // load the input data (cmp file)
-    psArray *rawstars = psastroReadCMP (&header, argv[2]);
+    // load input data (config and images (signal, noise, mask)
+    psastroParseCamera (config);
+
+    // perform the astrometric solution
+    psastroDataLoop (input, config);
 
     // simple layout interpretation, basic WCS conversion
@@ -23,4 +28,6 @@
     psastroWriteCMP (fpa, argv[3]);
 
+    psLogMsg ("psphot", 3, "complete psphot run: %f sec\n", psTimerMark ("complete"));
+
     psFree (config);
     psFree (fpa);