Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 5273)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 5285)
@@ -9,7 +9,4 @@
 # include <arpa/inet.h>
 
-/* this is generated locally from the entries in addstar/def 
-# include "commcode.h" */
-
 /* used in find_matches, find_matches_refstars */
 # define IN_CATALOG(R,D) ( \
@@ -28,5 +25,5 @@
 enum {M_IMAGE, M_REFLIST, M_REFCAT};
 
-/* global variables set in parameter file */
+/* global which define database info / data sources (KEEP) */
 char   ImageCat[256];
 char   GSCFILE[256];
@@ -38,4 +35,10 @@
 char   GSCDIR[256];
 char   CDROM[256];
+char   SubpixDatafile[256];
+char   PASSWORD[80];
+char   HOSTNAME[80];
+int    NVALID, *VALID_IP;
+
+/* used to select entries from header (gstars or parse_time) (KEEP) */
 char   DateKeyword[64];
 char   DateMode[64];
@@ -47,41 +50,60 @@
 char   CCDNumKeyword[64];
 char   STKeyword[64];
-char   SubpixDatafile[256];
-double DEFAULT_RADIUS, NSIGMA, SNLIMIT;
-double ZeroPt;
-double Latitude, SiderealTime;
-int    XOVERSCAN, YOVERSCAN;
-int    XMIN, XMAX, YMIN, YMAX;
-char   PASSWORD[80];
-char   HOSTNAME[80];
-int    NVALID, *VALID_IP;
-
-/* globals set by command-line options */
-int   CALIBRATE;
-int   DUMP_MATCHES;
-int   ONLY_IMAGES;
+
+/* add to options as an int / keep the global? */
+PhotCode *thiscode;
+
+/* how to carry this around? */
+Coords   *MOSAIC;
+
+/* globals set by command-line options (AddstarClientOptions) */
+/* move into AddstarClientOptions completely */
+# if (1)
+int   MODE;
 int   EXISTING_REGIONS;
-int   FORCE_READ;
-int   SKYPROBE;
-int   ADDREFS;
+int   ONLY_MATCH;
+int   SKIP_MISSED;
 int   REPLACE;
-int   ONLY_MATCH;
 int   CLOSEST;
-int   VERBOSE;
-int   FITS_INPUT;
-int   SKIP_MISSED;
-int   ACCEPT_ASTROM;
-int   TEXTMODE;
 int   NOSORT;
 int   UPDATE;
-int   MODE;
-
-char *DUMP;
-char *SELECT_2MASS_QUALITY;
-
-time_t    TIMEREF;
-PhotCode *thiscode;
-GSCRegion UserPatch;
-Coords   *MOSAIC;
+int   ONLY_IMAGES;
+int   CALIBRATE;
+double DEFAULT_RADIUS;   // XXX add to AddstarClientOptions
+double NSIGMA;           // XXX add to AddstarClientOptions
+# endif
+
+/* these globals modify the behavior of gstars (KEEP) */
+double SNLIMIT;
+int    ACCEPT_ASTROM;  // accept even bad astrometry solutions (NASTRO == 0)
+int    TEXTMODE;
+int    VERBOSE;
+char  *DUMP;
+int    XOVERSCAN;  // used to modify stored image dimensions 
+int    YOVERSCAN;  
+int    XMIN;       // used to filter loaded star list 
+int    XMAX;
+int    YMIN;
+int    YMAX;
+double Latitude;   // carried into image structure from config
+
+/* modify server behavoir (make this an addstar cleanup mode?) */
+int    FORCE_READ;
+
+int   SKYPROBE;  
+// XXX this should be replaced with 
+// 1) an airmass accuracy option
+// 2) an alternative CATFORMAT with the sky element correctly defined.
+
+/* these depend on HOW we implement the client/server interaction for CAT/REF modes */
+time_t    TIMEREF;    // used by MODE REF
+GSCRegion UserPatch;  // used by MODE CAT
+char *SELECT_2MASS_QUALITY;  // used only by get2mass_as
+
+double ZeroPt;  // double check for consistency (image header / config file): KEEP global
+
+int   FITS_INPUT;     // unused??? 
+int   ADDREFS;        // unused??? 
+int   DUMP_MATCHES;   // un-set??? 
 
 /*** addstar prototypes ***/