Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 5285)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 5322)
@@ -51,4 +51,21 @@
 char   STKeyword[64];
 
+/* these globals modify the behavior of gstars (KEEP) */
+double SNLIMIT;
+int    ACCEPT_ASTROM;  // accept even bad astrometry solutions (NASTRO == 0)
+int    TEXTMODE;       // force input file to be loaded as RAW
+char  *DUMP;           // dump out intermediate results
+int    XOVERSCAN;      // used to modify stored image dimensions 
+int    YOVERSCAN;      // used to modify stored image dimensions 
+int    XMIN;           // used to filter loaded star list 
+int    XMAX;           // used to filter loaded star list 
+int    YMIN;           // used to filter loaded star list 
+int    YMAX;           // used to filter loaded star list 
+double Latitude;       // carried into image structure from config
+
+/* these globals are used separately by both client and server (KEEP) */
+double ZeroPt;  // double check for consistency
+int    VERBOSE;
+
 /* add to options as an int / keep the global? */
 PhotCode *thiscode;
@@ -59,32 +76,18 @@
 /* globals set by command-line options (AddstarClientOptions) */
 /* move into AddstarClientOptions completely */
-# if (1)
-int   MODE;
-int   EXISTING_REGIONS;
-int   ONLY_MATCH;
-int   SKIP_MISSED;
-int   REPLACE;
-int   CLOSEST;
-int   NOSORT;
-int   UPDATE;
-int   ONLY_IMAGES;
-int   CALIBRATE;
+# if (0)
+int    MODE;
+int    EXISTING_REGIONS;
+int    ONLY_MATCH;
+int    SKIP_MISSED;
+int    REPLACE;
+int    CLOSEST;
+int    NOSORT;
+int    UPDATE;
+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?) */
@@ -99,15 +102,9 @@
 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??? 
+char     *SELECT_2MASS_QUALITY;  // used only by get2mass_as
 
 /*** addstar prototypes ***/
 void       AddToCalibration       PROTO((Average *average, Measure *measure, Measure *new, int *next, int Nstar));
-void       ConfigInit             PROTO((int *argc, char **argv));
+AddstarClientOptions ConfigInit   PROTO((int *argc, char **argv));
 void       FindCalibration        PROTO((Image *image));
 int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
@@ -125,11 +122,11 @@
 float      airmass                PROTO((float secz_image, double ra, double dec, double st, double latitude));
 void       aregion                PROTO((GSCRegion *region, FILE *f, double ra, double dec));
-int        args                   PROTO((int argc, char **argv));
+AddstarClientOptions args         PROTO((int argc, char **argv, AddstarClientOptions options));
 void       check_permissions      PROTO((char *basefile));
 int        dump_rawstars          PROTO((Stars *stars, int Nstars));
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
-void       find_matches           PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap));
-void       find_matches_closest   PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap));
-void       find_matches_refstars  PROTO((GSCRegion *region, Stars **stars, int Nstars, Catalog *catalog));
+void       find_matches           PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, AddstarClientOptions options));
+void       find_matches_closest   PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, AddstarClientOptions options));
+void       find_matches_refstars  PROTO((GSCRegion *region, Stars **stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
 Stars    **find_subset            PROTO((GSCRegion *region, Stars *stars, int Nstars, int *NSTARS));
 int        gcatalog               PROTO((Catalog *catalog));
@@ -189,8 +186,4 @@
 Missing *sort_missing (Average *average, int Naverage, Missing *missing, int Nmissing, int *next_miss);
 
-int InitServerSocket (char *hostname, SockAddress *Address);
-int WaitServerSocket (int InitSocket, SockAddress *Address, int *validIP, int Nvalid);
-int GetClientSocket (char *hostname);
-
 /** 
   there is an inconsistency to be resolved: fixed structures (like Image)
@@ -202,7 +195,15 @@
 **/
 
-AddstarClientOptions args_client (int argc, char **argv);
-
-int args_server (int argc, char **argv);
+/** function for client / server **/ 
+
+AddstarClientOptions args_client (int argc, char **argv, AddstarClientOptions options);
+
+void args_server (int argc, char **argv);
+
 int CheckPassword (int BindSocket);
 int NewImage (int BindSocket);
+
+int InitServerSocket (char *hostname, SockAddress *Address);
+int WaitServerSocket (int InitSocket, SockAddress *Address, int *validIP, int Nvalid);
+int GetClientSocket (char *hostname);
+