Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 7779)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 7780)
@@ -38,4 +38,5 @@
 $(SRC)/get2mass.$(ARCH).o \
 $(SRC)/get2mass_as.$(ARCH).o \
+$(SRC)/get2mass_ops.$(ARCH).o \
 $(SRC)/get2mass_as_raw.$(ARCH).o \
 $(SRC)/get2mass_dr2.$(ARCH).o \
Index: /trunk/Ohana/src/addstar/include/2mass.h
===================================================================
--- /trunk/Ohana/src/addstar/include/2mass.h	(revision 7779)
+++ /trunk/Ohana/src/addstar/include/2mass.h	(revision 7780)
@@ -36,2 +36,5 @@
 int get2mass_3star (Stars *star, char *line, int Nmax);
 int load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars);
+
+int get2mass_setup (int photcode);
+int get2mass_coords (char *line, double *R, double *D, int Nmax);
Index: /trunk/Ohana/src/addstar/src/get2mass_ops.c
===================================================================
--- /trunk/Ohana/src/addstar/src/get2mass_ops.c	(revision 7779)
+++ /trunk/Ohana/src/addstar/src/get2mass_ops.c	(revision 7780)
@@ -15,4 +15,5 @@
   FilterSkip = TimeSkip = Qentry = 0;
   Photcode = photcode;
+  if (photcode == -1) return TRUE;
 
   if (photcode == TM_J) {
Index: /trunk/Ohana/src/addstar/src/load2mass.c
===================================================================
--- /trunk/Ohana/src/addstar/src/load2mass.c	(revision 7779)
+++ /trunk/Ohana/src/addstar/src/load2mass.c	(revision 7780)
@@ -5,5 +5,5 @@
 
   char *path;
-  int i, N, Nrefcat;
+  int i;
   SkyTable *sky, *sky2mass;
   AddstarClientOptions options;
@@ -23,5 +23,5 @@
   
   for (i = 0; i < sky2mass[0].Nregions; i++) {
-    fprintf (stderr, "loading %s\n", sky[0].filename[i]);
+    fprintf (stderr, "loading %s\n", sky2mass[0].filename[i]);
     load2mass_as_rawdata (sky, sky2mass[0].filename[i], options);
   }
Index: /trunk/Ohana/src/addstar/src/load2mass_as_rawdata.c
===================================================================
--- /trunk/Ohana/src/addstar/src/load2mass_as_rawdata.c	(revision 7779)
+++ /trunk/Ohana/src/addstar/src/load2mass_as_rawdata.c	(revision 7780)
@@ -6,8 +6,8 @@
  */
 
-/* read in chunks of ~16MB */
+/* read in chunks of ~64MB */
 # define NBYTE 0x4000000
 # define NBREC 330
-# define DEBUG 1
+# define DEBUG 0
 
 int load2mass_as_rawdata (SkyTable *skytable, char *filename, AddstarClientOptions options) {
@@ -22,5 +22,5 @@
   char *buffer, *p, *q;
 
-  Stars *stars, **subset;
+  Stars *stars;
   TMStars *tstars;
   SkyList *skylist;
@@ -28,5 +28,5 @@
   Catalog catalog;
 
-  get2mass_setup (options.photcode);
+  get2mass_setup (-1);
 
   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
@@ -136,6 +136,9 @@
 	tstars[j].flag = TRUE;
 
-	Nstars ++;
-	CHECK_REALLOCATE (stars, Stars, NSTARS, Nstars, 3000);
+	Nstars += 3;
+	if (Nstars >= NSTARS - 3) {
+	  NSTARS += 3000;
+	  REALLOCATE (stars, Stars, NSTARS);
+	}
       }
       if (!Nstars) {
@@ -155,5 +158,5 @@
 	// assume no input star matches an existing star 
 	// simply add to the existing table
-	load2mass_catalog (catalog, stars, Nstars);
+	load2mass_catalog (&catalog, stars, Nstars);
 
 	wcatalog (&catalog);
Index: /trunk/Ohana/src/addstar/src/load2mass_catalog.c
===================================================================
--- /trunk/Ohana/src/addstar/src/load2mass_catalog.c	(revision 7779)
+++ /trunk/Ohana/src/addstar/src/load2mass_catalog.c	(revision 7780)
@@ -2,4 +2,6 @@
 
 int load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars) {
+
+  int i, j, Nsec, Nmeas, Nave, NMEAS, NAVE;
 
   Nsec = GetPhotcodeNsecfilt ();