Index: trunk/psastro/src/psastro.c
===================================================================
--- trunk/psastro/src/psastro.c	(revision 10833)
+++ trunk/psastro/src/psastro.c	(revision 10855)
@@ -53,11 +53,14 @@
     }
 
-    if (!psastroChipAstrom (config, refs)) {
-      psErrorStackPrint(stderr, "failed to perform single chip astrometry\n");
-      exit (1);
+    bool chipastro = psMetadataLookupBool (NULL, config->arguments, "PSASTRO.CHIP.MODE");
+    if (chipastro) {
+	if (!psastroChipAstrom (config, refs)) {
+	    psErrorStackPrint(stderr, "failed to perform single chip astrometry\n");
+	    exit (1);
+	}
     }
 
-    bool mosastro = psMetadataLookupBool (NULL, config->arguments, "MOSAIC.MODE");
-    if (!mosastro) {
+    bool mosastro = psMetadataLookupBool (NULL, config->arguments, "PSASTRO.MOSAIC.MODE");
+    if (mosastro) {
 	if (!psastroMosaicAstrom (config, refs)) {
 	    psErrorStackPrint(stderr, "failed to perform mosaic camera astrometry\n");