Index: trunk/Ohana/src/addstar/include/2mass.h
===================================================================
--- trunk/Ohana/src/addstar/include/2mass.h	(revision 24977)
+++ trunk/Ohana/src/addstar/include/2mass.h	(revision 38986)
@@ -22,7 +22,8 @@
 
 SkyTable *get2mass_acc (SkyRegion *patch, char *path, char *accel);
-Stars    *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars);
-Stars    *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
-Stars    *get2mass_AS_rawdata (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
+
+// Stars    *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars);
+// Stars    *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
+// Stars    *get2mass_AS_rawdata (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
 
 SkyTable *scan2mass_acc (char *path, char *accel);
@@ -35,21 +36,23 @@
 int       load2mass_as_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options);
 SkyTable *load2mass_acc (char *path, char *accel);
-int       get2mass_3star (Stars *star, char *line, int Nmax);
-int       load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars);
+
+// 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);
-int       get2mass_star (Stars *star, char *line, int Nmax);
-int       get2mass_3star (Stars *star, char *line, int Nmax);
 
-int get2mass_3star_full (Stars **star, char *line, int Nmax);
+// int       get2mass_star (Stars *star, char *line, int Nmax);
+// int       get2mass_3star (Stars *star, char *line, int Nmax);
+
+int get2mass_3star_full (Measure *measure, char *line, int Nmax);
 char *next2MASSfield (char *line);
-int set2MASS_ph_qual (Stars *star, char qual);
-int set2MASS_rd_flag (Stars *star, char qual);
-int set2MASS_cc_flag (Stars *star, char qual);
-int set2MASS_bl_flag (Stars *star, char qual);
-int set2MASS_gal_flag (Stars *star, char qual);
-int set2MASS_mp_flag (Stars *star, char qual);
-int set2MASS_dup_flag (Stars *star, char qual);
-int set2MASS_use_flag (Stars *star, char qual);
+int set2MASS_ph_qual (Measure *measure, char qual);
+int set2MASS_rd_flag (Measure *measure, char qual);
+int set2MASS_cc_flag (Measure *measure, char qual);
+int set2MASS_bl_flag (Measure *measure, char qual);
+int set2MASS_gal_flag (Measure *measure, char qual);
+int set2MASS_mp_flag (Measure *measure, char qual);
+int set2MASS_dup_flag (Measure *measure, char qual);
+int set2MASS_use_flag (Measure *measure, char qual);
 int get2mass_sortStars (TMStars *tstars, int Ntstars);