Index: trunk/Ohana/src/opihi/include/dvo1.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvo1.h	(revision 4689)
+++ trunk/Ohana/src/opihi/include/dvo1.h	(revision 4805)
@@ -23,59 +23,54 @@
 } RegionFile;
 
-/* aregion, region_list, match_image, LoadImages */
-RegionFile   *find_regions	    PROTO((double Ra, double Dec, double radius, int *Nregions));
-GSCRegion    *get_regions	    PROTO((Image *image, int *Nregions));
-void	      aregion		    PROTO((GSCRegion *region, FILE *f, double ra, double dec, char *path));
-RegionFile   *region_list	    PROTO((char *filename, int *Nregions));
-int	      match_image	    PROTO((Image *image, int Nimage, unsigned int T, short int S));
-Image  	     *LoadImages	    PROTO((int *Nimage));
-void	      image_subset	    PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, Graphdata *graph, int RegionSelect, unsigned long int tzero, double trange, int TimeSelect));
-void	      sort_images	    PROTO((Image *image, int N));
-void	      sortave		    PROTO((Average *ave, int N));
-void	      cprecess		    PROTO((Average *average, int Naverage, double in_epoch, double out_epoch));
-void	      compare		    PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius));
-
-/*** photometry functions ***/
-double       *ExtractByDMag	    PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
-double       *ExtractDMag	    PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
-double       *ExtractMagnitudes	    PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n));
-double       *ExtractMeasures	    PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
+/*** dvo prototypes ***/
+int           DetermineTypeCode     PROTO((Average *average, Measure *measure, int code));
+double        DetermineTypefrac     PROTO((Average *average, Measure *measure, PhotCode *code));
+double        ExtractAverages       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param));
+double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
+double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
+double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n));
+double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
 double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
 double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
+void          FreeImageSelection    PROTO(());
+void          FreeImageSelection    PROTO(());
+int           GetAverageParam       PROTO((char *parname));
+void          GetAverageParamHelp   PROTO(());
+int           GetMagMode            PROTO((char *string));
+double        GetMeasure            PROTO((int param, Average *average, Measure *measure, double mag));
+int           GetMeasureParam       PROTO((char *parname));
+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));
+void          InitDVO               PROTO(());
+int           InitPhotcodes         PROTO(());
+Image        *LoadImages            PROTO((int *Nimage));
+Image        *MatchImage            PROTO((unsigned int time, short int source));
 Image        *MatchImage            PROTO((unsigned int time, short int source));
 Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
-int	      DetermineTypeCode	    PROTO((Average *average, Measure *measure, int code));
-double	      DetermineTypefrac	    PROTO((Average *average, Measure *measure, PhotCode *code));
-double	      ExtractAverages	    PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param));
-void	      FreeImageSelection    PROTO(());
-int	      GetAverageParam	    PROTO((char *parname));
-void	      GetAverageParamHelp   PROTO(());
-int	      GetMagMode	    PROTO((char *string));
-double 	      GetMeasure	    PROTO((int param, Average *average, Measure *measure, double mag));
-int	      GetMeasureParam	    PROTO((char *parname));
-int	      GetMeasureTypeCode    PROTO((Measure *measure));
-int	      GetPhotcodeInfo	    PROTO((char *string, PhotCode **Code, int *Mode));
-int	      GetSelectionParam	    PROTO(());
-int	      InitPhotcodes	    PROTO(());
-int	      Quality		    PROTO((Measure *measure, int IsDophot));
+int           Quality               PROTO((Measure *measure, int IsDophot));
 int           SelectMags            PROTO((int Nphot, int Tphot, int Ns, Average *average, Measure *measure, SecFilt *secfilt, int UL));
-int	      SetImageSelection	    PROTO((int mode));
-int	      SetPhotSelections	    PROTO((int *argc, char **argv, int Nparams));
-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));
+RegionFile   *SelectRegions         PROTO((char *RegionName, char *RegionList, int *nregions));
+int           SetImageSelection     PROTO((int mode));
+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   *SelectRegions         PROTO((char *RegionName, char *RegionList, int *nregions));
-
-void InitDVO ();
-
-void FreeImageSelection ();
-Image *MatchImage (unsigned int time, short int source);
-int GetRegionSelection ();
-int SetRegionSelection (int *argc, char **argv, char **RegionName, char **RegionList);
-void sort_image_subset (Image *image, int *subset, int N);
-int match_image_subset (Image *image, int *subset, int Nsubset, unsigned int T, short int S);
-int GetTimeSelection (time_t *tz, time_t *te);
+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));
 
 # endif