Index: trunk/Ohana/src/opihi/include/dvo1.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvo1.h	(revision 5442)
+++ trunk/Ohana/src/opihi/include/dvo1.h	(revision 5451)
@@ -57,5 +57,4 @@
 int           GetMeasureTypeCode    PROTO((Measure *measure));
 int           GetPhotcodeInfo       PROTO((char *string, PhotCode **Code, int *Mode));
-int           GetRegionSelection    PROTO(());
 int           GetSelectionParam     PROTO(());
 int           GetTimeSelection      PROTO((time_t *tz, time_t *te));
@@ -68,27 +67,34 @@
 int           Quality               PROTO((Measure *measure, int IsDophot));
 int           SelectMags            PROTO((int Nphot, int Tphot, int Ns, Average *average, Measure *measure, SecFilt *secfilt, int UL));
-RegionFile   *SelectRegions         PROTO((char *RegionName, char *RegionList, int *nregions));
-int           SetImageSelection     PROTO((int mode));
+
+SkyList      *SelectRegions         PROTO((char *RegionName, char *RegionList));
+SkyList      *SkyListLoadFile       PROTO((char *filename));
+int           SetCATDIR             PROTO((char *path, int verbose));
+SkyTable     *GetSkyTable           PROTO(());
+SkyList      *SkyListFromFile       PROTO((char *filename));
+int           SetRegionSelection    PROTO((int *argc, char **argv, char **RegionName, char **RegionList));
+
+int           SetImageSelection     PROTO((int mode, int RegionSelect));
 int           SetPhotSelections     PROTO((int *argc, char **argv, int Nparams));
-int           SetRegionSelection    PROTO((int *argc, char **argv, char **RegionName, char **RegionList));
 int           SetSelectionParam     PROTO((int param));
 int           TestAverage           PROTO((PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure));
 int           TestPhotSelections    PROTO((PhotCode **code, int *mode, int param));
-void          aregion               PROTO((GSCRegion *region, FILE *f, double ra, double dec, char *path));
 void          compare               PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius));
 void          cprecess              PROTO((Average *average, int Naverage, double in_epoch, double out_epoch));
-RegionFile   *find_regions          PROTO((double Ra, double Dec, double radius, int *Nregions));
-GSCRegion    *get_regions           PROTO((Image *image, int *Nregions));
 void          image_subset          PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, Graphdata *graph, int RegionSelect, unsigned long int tzero, double trange, int TimeSelect));
 int           match_image           PROTO((Image *image, int Nimage, unsigned int T, short int S));
 int           match_image_subset    PROTO((Image *image, int *subset, int Nsubset, unsigned int T, short int S));
 void          print_value           PROTO((FILE *f, double value, short int ival));
-RegionFile   *region_list           PROTO((char *filename, int *Nregions));
 void          sort_image_subset     PROTO((Image *image, int *subset, int N));
 void          sort_images           PROTO((Image *image, int N));
 void          sortave               PROTO((Average *ave, int N));
-CMPstars *cmpReadFits (FILE *f, int *nstars);
-CMPstars *cmpReadText (FILE *f, int *nstars);
-int RD_to_XYpic (double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside);
+CMPstars     *cmpReadFits           PROTO((FILE *f, int *nstars));
+CMPstars     *cmpReadText           PROTO((FILE *f, int *nstars));
+int           RD_to_XYpic           PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside));
+
+RegionFile   *find_regions          PROTO((double Ra, double Dec, double radius, int *Nregions));
+GSCRegion    *get_regions           PROTO((Image *image, int *Nregions));
+RegionFile   *region_list           PROTO((char *filename, int *Nregions));
+void          aregion               PROTO((GSCRegion *region, FILE *f, double ra, double dec, char *path));
 
 # endif