Index: trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- trunk/Ohana/src/addstar/include/addstar.h	(revision 3521)
+++ trunk/Ohana/src/addstar/include/addstar.h	(revision 4299)
@@ -51,11 +51,4 @@
 } Stars;
 
-/* structure for data on a catalog region */
-typedef struct {
-  char filename[256];
-  double RA[2];
-  int Nrec;
-} TM_Region;
-
 enum {M_IMAGE, M_REFLIST, M_REFCAT};
 
@@ -66,5 +59,6 @@
 char   GSCFILE[256];
 char   CATDIR[256];
-char   TWO_MASS_DIR[256];
+char   TWO_MASS_DIR_AS[256];
+char   TWO_MASS_DIR_DR2[256];
 char   GSCDIR[256];
 char   CDROM[256];
@@ -99,4 +93,5 @@
 int DUMP_MATCHES;
 int ONLY_IMAGES;
+int EXISTING_REGIONS;
 int FORCE_READ;
 int SKYPROBE;
@@ -172,7 +167,5 @@
 **/
 
-Stars *get2mass (GSCRegion *patch, int *NSTARS);
-TM_Region *get2mass_acc (GSCRegion *patch, int *nfiles);
-Stars *get2mass_data (TM_Region *region, GSCRegion *patch, int *nstars);
+Stars *get2mass (GSCRegion *patch, int *NSTARS, int mode);
 GSCRegion *gregion_stars (Stars *stars, int Nstars, int *Nregion);
 Stars *grefstars (char *file, int *Nstars);