Index: trunk/Ohana/src/addstar/include/WISE.h
===================================================================
--- trunk/Ohana/src/addstar/include/WISE.h	(revision 32346)
+++ trunk/Ohana/src/addstar/include/WISE.h	(revision 33653)
@@ -21,35 +21,25 @@
 short WISE_W1, WISE_W2, WISE_W3, WISE_W4;
 
-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);
+AddstarClientOptions args_loadwise (int argc, char **argv, AddstarClientOptions options);
 
-SkyTable *scan2mass_acc (char *path, char *accel);
-int       scan2mass_as_data (char *filename);
+int loadwise_prelim_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options);
 
-char     *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
-e_time    get2mass_time (char *ptr, int Nbound, int Nbyte);
-e_time    get2mass_date (char *ptr, int Nbound, int Nmax);
+int getWISE_setup ();
+int getWISE_coords (char *line, double *R, double *D, int Nmax);
+e_time getWISE_date (char *ptr, int Nbound, int Nmax);
+e_time getWISE_time (char *ptr, int Nbound, int Nmax);
 
-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 getWISE_sortStars (WISE_Stars *tstars, int Ntstars);
+int loadwise_star_full (Stars **star, char *line, int Nmax);
 
-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);
+char *nextWISEfield (char *line);
+int setWISE_cc_flag (Stars *star, char qual);
+int setWISE_ph_qual (Stars *star, char qual);
+int setWISE_rd_flag (Stars *star, char qual);
+int setWISE_bl_flag (Stars *star, char qual);
+int setWISE_gal_flag (Stars *star, char qual);
+int setWISE_mp_flag (Stars *star, char qual);
+int setWISE_dup_flag (Stars *star, char qual);
+int setWISE_use_flag (Stars *star, char qual);
 
-int get2mass_3star_full (Stars **star, 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 get2mass_sortStars (WISE_Stars *tstars, int Ntstars);
+char *skipNbounds (char *line, char bound, int Nbound, int Nbyte);