Index: /trunk/doc/design/phase4.txt
===================================================================
--- /trunk/doc/design/phase4.txt	(revision 10833)
+++ /trunk/doc/design/phase4.txt	(revision 10833)
@@ -0,0 +1,39 @@
+
+output from ppImage is (in general) a multiple file, multiple
+extension set of FITS images:
+
+exp01.chipNN.p2.fits
+
+along with the output object files with the associated astrometry:
+
+exp01.chipNN.p2.cmp
+
+for phase3, output is a single MEF file per exposure with one chips
+per extension.  
+
+ISP:
+exp01.p2.fits (image data in PHU)
+exp01.p2.cmp (astrometry data in PHU, object in table, chip mode)
+
+Megacam:
+exp01.p2.fits (one chip per extension)
+exp01.p2.cmp (mosaic astrometry in PHU, chip astrometry per extension)
+
+GPC:
+exp01.chipNN.p2.fits (one chip per extension)
+exp01.chipNN.p2.cmp (astrometry in PHU, chip astrometry per extension)
+
+exp01.p3.cmp (mosaic astrometry in PHU, chip astrometry per extension)
+
+
+user interface to warp:
+
+warp skycell.fits -image exp01.p2.fits -header exp01.p3.cmp output.fits
+ - if -header is not supplied, assume image file contains astrometry
+ - skycell astrometry + NAXIS1,2 defines output grid
+ - output.fits is created (will be replaced if it exists)
+ - allow a subset of the input image to be warped? (specific
+ extensions)
+ - EXTNAME in input.fits is matched to EXTNAME in header.fits
+   - use the WRP / DIS astrometry if available
+
Index: /trunk/psastro/doc/notes.txt
===================================================================
--- /trunk/psastro/doc/notes.txt	(revision 10832)
+++ /trunk/psastro/doc/notes.txt	(revision 10833)
@@ -1,2 +1,13 @@
+
+2006.12.26
+
+ work still to be done for psastro:
+
+ - test suite
+   - create a DVO database from a fake population
+   - create fake images with range of errors drawn from DVO
+
+ - 
+
 
 we have a few different astrometry circumstances for our complete
Index: /trunk/psastro/src/psastro.c
===================================================================
--- /trunk/psastro/src/psastro.c	(revision 10832)
+++ /trunk/psastro/src/psastro.c	(revision 10833)
@@ -53,11 +53,11 @@
     }
 
-    char *mosastro = psMetadataLookupStr (NULL, config->arguments, "MOSASTRO");
-    if (mosastro == NULL) {
-        if (!psastroChipAstrom (config, refs)) {
-	    psErrorStackPrint(stderr, "failed to perform single chip astrometry\n");
-	    exit (1);
-	}
-    } else {
+    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) {
 	if (!psastroMosaicAstrom (config, refs)) {
 	    psErrorStackPrint(stderr, "failed to perform mosaic camera astrometry\n");
Index: /trunk/psastro/src/psastroArguments.c
===================================================================
--- /trunk/psastro/src/psastroArguments.c	(revision 10832)
+++ /trunk/psastro/src/psastroArguments.c	(revision 10833)
@@ -12,7 +12,4 @@
     }
 
-    // basic pslib options
-    psLogSetFormat ("M");
-
     // load config data from default locations
     pmConfig *config = pmConfigRead(&argc, argv, PSASTRO_RECIPE);
@@ -23,5 +20,5 @@
 
     // save the following additional recipe values based on command-line options
-    // these options override the PSPHOT recipe values loaded from recipe files
+    // these options override the PSASTRO recipe values loaded from recipe files
     psMetadata *options = pmConfigRecipeOptions (config, PSASTRO_RECIPE);
 
@@ -43,5 +40,5 @@
     if ((N = psArgumentGet (argc, argv, "-mosastro"))) {
         psArgumentRemove (N, &argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "MOSASTRO", PS_DATA_STRING, "", psStringCopy(argv[N]));
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "MOSAIC.MODE", PS_DATA_BOOL, "", psStringCopy(argv[N]));
         psArgumentRemove (N, &argc, argv);
     }
Index: /trunk/psconfig/TODO
===================================================================
--- /trunk/psconfig/TODO	(revision 10833)
+++ /trunk/psconfig/TODO	(revision 10833)
@@ -0,0 +1,25 @@
+
+current goal is a large-scale release for Jan 31, 2007, including all
+of the single image analysis.  Things we still need to get done before
+this release:
+
+- finish psastro
+  - test suite for single image and mosaic astrometry
+  - test single file and multiple file I/O
+  - add plotting functions
+  * defer the video-mode astrometry analysis
+
+- demonstrate fringe construction
+
+- DVO / addstar integration with pipeline
+
+- better parsing of the pantasks / ippTools interface
+
+- script suite installation for opihi
+
+- ipp config installation into share
+
+- camera / layout re-work for config system
+
+- further work on the ippMonitor user interface
+