Index: trunk/Ohana/src/opihi/include/dvo1.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvo1.h	(revision 4420)
+++ trunk/Ohana/src/opihi/include/dvo1.h	(revision 4585)
@@ -40,27 +40,35 @@
 
 /*** photometry functions ***/
-int           SetPhotSelections     PROTO((int *argc, char **argv));
-int           SetImageSelection     PROTO((int mode, Graphdata *graphsky, int state));
-void          FreeImageSelection    PROTO(());
+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));
+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           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 param));
+void          print_value           PROTO((FILE *f, double value, short int ival));
 
-int           InitPhotcodes         PROTO(());
-int           GetPhotcodeInfo       PROTO((char *string, PhotCode **Code, int *Mode));
-
-int           GetAverageParam       PROTO((char *parname));
-int           GetMeasureParam       PROTO((char *parname));
-int           GetMagMode            PROTO((char *string));
-int           SelectMags            PROTO((int Nphot, int Tphot, int Ns, Average *average, Measure *measure, SecFilt *secfilt, int UL));
-void          print_value           PROTO((FILE *f, double value, short int ival));
-int           GetMeasureTypeCode    PROTO((Measure *measure));
-int           DetermineTypeCode     PROTO((Average *average, Measure *measure, int Nphot));
-double        ExtractAverages       PROTO((PhotCode *code, int mode, Average *ave, SecFilt *sec, Measure *meas, int param));
-double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *ave, SecFilt *sec, Measure *meas, int *n));
-double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *ave, SecFilt *sec, Measure *meas, int *nlist, int param));
-double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
-double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
-double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
-double        DetermineTypefrac     PROTO((Average *average, Measure *measure, PhotCode *code));
-void          GetAverageParamHelp   PROTO(());
-
+RegionFile   *SelectRegions         PROTO((char *RegionName, char *RegionList, int *nregions));
 
 # endif