Index: trunk/Ohana/src/relphot/include/relphot.h
===================================================================
--- trunk/Ohana/src/relphot/include/relphot.h	(revision 4796)
+++ trunk/Ohana/src/relphot/include/relphot.h	(revision 4805)
@@ -88,5 +88,5 @@
 
 int TimeSelect;
-unsigned int TSTART, TSTOP;
+time_t TSTART, TSTOP;
 
 # ifdef GRID_V1
@@ -98,115 +98,98 @@
 # endif
 
-/***** prototypes ****/
-int main (int argc, char **argv);
-Catalog *load_catalogs (GSCRegion *region, int Nregion, GSCRegion *fullregion);
-GSCRegion *load_images (char *seed, int *nregion, GSCRegion *fullregion);
-GSCRegion *name_region (char *name, int *Nregions);
-GSCRegion *find_regions (Image *image, int Nimage, int *Nregions, GSCRegion *fullregion);
-GSCRegion *get_regions (double minRa, double maxRa, double minDec, double maxDec, int *Nregions);
-Image *find_images (GSCRegion *region, int Nregion, int *Nimages, int **LineNum);
-double opening_angle (double x1, double y1, double x2, double y2, double x3, double y3);
-int edge_check (double *x1, double *y1, double *x2, double *y2);
-int corner_check (double *x1, double *y1, double *x2, double *y2);
-int hms_to_deg (double *h0, double *h1, double *d0, double *d1, char *string);
-int bcatalog (Catalog *subcatalog, Catalog *catalog, GSCRegion *fullregion);
-int findMosaics (Catalog *catalog, int Ncatalog);
-int setMmos (Catalog *catalog, int Poor);
-int setMrel (Catalog *catalog, int Ncatalog);
-int setrefcode (Image *image, int Nimage); 
-int args (int argc, char **argv);
-short getMgrid (int meas, int cat);
-short getMcal (int meas, int cat);
-short getMmos (int meas, int cat);
-short getMrel (Catalog *catalog, int meas, int cat);
-void initGrid (int dX, int dY);
-void initGridBins (Catalog *catalog, int Ncatalog);
-void initMosaics (Image *image, int Nimage);
-void initMosaicGrid (Image *image, int Nimage);
-void initMosaicBins (Catalog *catalog, int Ncatalog);
-void initMrel (Catalog *catalog, int Ncatalog);
-void initialize (int argc, char **argv);
-void ConfigInit (int *argc, char **argv);
-void mark_images (Image *image, int Nimage, Image *timage, int Ntimage);
-void setMgrid (Catalog *catalog);
-void dumpGrid ();
-void initImages (Image *input, int N);
-void initImageBins (Catalog *catalog, int Ncatalog);
-void findImages (Catalog *catalog, int Ncatalog);
-void matchImage (Catalog *catalog, int meas, int cat);
-void matchMosaics (Catalog *catalog, int meas, int cat);
-void setMcal (Catalog *catalog, int Poor);
-void clean_images ();
-void clean_stars (Catalog *catalog, int Ncatalog);
-void reload_catalogs (GSCRegion *region, int Nregion, GSCRegion *fullregion);
-void free_catalogs (Catalog *catalog, int Ncatalog);
-void set_ZP (double ZERO);
-char *GetPhotnamebyCode (PhotCodeData *photcodes, int code);
-StatType statsStarS (Catalog *catalog, int Ncatalog);
-StatType statsStarX (Catalog *catalog, int Ncatalog);
-StatType statsStarN (Catalog *catalog, int Ncatalog);
-StatType statsImageN (Catalog *catalog);
-StatType statsImageX (Catalog *catalog);
-StatType statsImageM (Catalog *catalog);
-void plot_scatter (Catalog *catalog, int Ncatalog);
-void plot_defaults (Graphdata *graphdata);
-void plot_list (Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *file);
-void plot_stars (Catalog *catalog, int Ncatalog);
-void plot_chisq (Catalog *catalog, int Ncatalog);
-void plot_star_coords (Catalog *catalog, int Ncatalog);
-void plot_grid (Catalog *catalog);
-void dump_grid (); 
-int *SelectRefMosaic (Mosaic **refmosaic, int *Nimage);
-Image *getimage (int N);
-void InterpolateGrid (float *buffer, int Nx, int Ny, Coords *ccd, Coords *gcoords);
-void plot_mosaic_fields (Catalog *catalog);
-void plot_mosaics ();
-void plot_images ();
-void wimages ();
-void clean_mosaics ();
-void freeMosaicBins (int Ncatalog);
-void freeGridBins (int Ncatalog);
-void clean_measures (Catalog *catalog, int Ncatalog, int final);
-void global_stats (Catalog *catalog, int Ncatalog);
-StatType statsImagedM (Catalog *catalog);
-StatType statsMosaicdM (Catalog *catalog);
-StatType statsMosaicM (Catalog *catalog);
-StatType statsMosaicN (Catalog *catalog);
-StatType statsMosaicX (Catalog *catalog);
-Coords *getCoords (int meas, int cat);
-int setExclusions (Catalog *catalog, int Ncatalog);
-void freeImageBins (int Ncatalog);
-void sortA (double *X, int N);
-void sortB (double *X, double *Y, int N);
-void sortC (double *X, double *Y, double *F1, double *F2, int N);
-void sortD (double *X, double *Y, double *Z, int N);
-void initstats (char *mode);
-int liststats (double *value, double *dvalue, int N, StatType *stats);
-
-int dms_to_ddd (double *Value, char *string);
-int str_to_radec (double *ra, double *dec, char *str1, char *str2);
-int chk_time (char *line);
-double sec_to_jd (unsigned long second);
-unsigned long int jd_to_sec (double jd);
-char *sec_to_date (unsigned long second);
-unsigned long date_to_sec (char *date);
-  
-int str_to_time (char *line, unsigned int *second);
-int str_to_dtime (char *line, double *second);
-int Fseek (FILE *f, long offset, int whence);
-void GetConfig (char *config, char *field, char *format, int N, void *ptr);
-void skip_measurements (Catalog *catalog, int pass);
-Image *getimages (int *N);
-
-void setMrelFinal (Catalog *catalog);
-void skip_measurements (Catalog *catalog, int pass);
-GSCRegion *get_regions (double minRa, double maxRa, double minDec, double maxDec, int *Nregions);
-int hms_to_deg (double *h0, double *h1, double *d0, double *d1, char *string);
-GSCRegion *find_regions (Image *image, int Nimage, int *Nregions, GSCRegion *fullregion);
-void getfullregion (Image *image, int Nimage, GSCRegion *fullregion);
-void setMcalFinal (Image *image, int Nimage);
-int gcatalog (Catalog *catalog, int FINAL);
-void write_coords (Header *header, Coords *coords);
-void wcatalog (Catalog *catalog);
-int setMrelOutput (Catalog *catalog, int Ncatalog, int mark);
-int setMcalOutput (Catalog *catalog, int Ncatalog);
+/*** relphot prototypes ***/
+void          ConfigInit          PROTO((int *argc, char **argv));
+int           Fseek               PROTO((FILE *f, long offset, int whence));
+void          GetConfig           PROTO((char *config, char *field, char *format, int N, void *ptr));
+char         *GetPhotnamebyCode   PROTO((PhotCodeData *photcodes, int code));
+void          InterpolateGrid     PROTO((float *buffer, int Nx, int Ny, Coords *ccd, Coords *gcoords));
+int          *SelectRefMosaic     PROTO((Mosaic **refmosaic, int *Nimage));
+int           args                PROTO((int argc, char **argv));
+int           bcatalog            PROTO((Catalog *subcatalog, Catalog *catalog, GSCRegion *fullregion));
+void          clean_images        PROTO(());
+void          clean_measures      PROTO((Catalog *catalog, int Ncatalog, int final));
+void          clean_mosaics       PROTO(());
+void          clean_stars         PROTO((Catalog *catalog, int Ncatalog));
+int           corner_check        PROTO((double *x1, double *y1, double *x2, double *y2));
+void          dumpGrid            PROTO(());
+void          dump_grid           PROTO(()); 
+int           edge_check          PROTO((double *x1, double *y1, double *x2, double *y2));
+void          findImages          PROTO((Catalog *catalog, int Ncatalog));
+int           findMosaics         PROTO((Catalog *catalog, int Ncatalog));
+Image        *find_images         PROTO((GSCRegion *region, int Nregion, int *Nimages, int **LineNum));
+GSCRegion    *find_regions        PROTO((Image *image, int Nimage, int *Nregions, GSCRegion *fullregion));
+void          freeGridBins        PROTO((int Ncatalog));
+void          freeImageBins       PROTO((int Ncatalog));
+void          freeMosaicBins      PROTO((int Ncatalog));
+void          free_catalogs       PROTO((Catalog *catalog, int Ncatalog));
+int           gcatalog            PROTO((Catalog *catalog, int FINAL));
+Coords       *getCoords           PROTO((int meas, int cat));
+short         getMcal             PROTO((int meas, int cat));
+short         getMgrid            PROTO((int meas, int cat));
+short         getMmos             PROTO((int meas, int cat));
+short         getMrel             PROTO((Catalog *catalog, int meas, int cat));
+GSCRegion    *get_regions         PROTO((double minRa, double maxRa, double minDec, double maxDec, int *Nregions));
+void          getfullregion       PROTO((Image *image, int Nimage, GSCRegion *fullregion));
+Image        *getimage            PROTO((int N));
+Image        *getimages           PROTO((int *N));
+void          global_stats        PROTO((Catalog *catalog, int Ncatalog));
+void          initGrid            PROTO((int dX, int dY));
+void          initGridBins        PROTO((Catalog *catalog, int Ncatalog));
+void          initImageBins       PROTO((Catalog *catalog, int Ncatalog));
+void          initImages          PROTO((Image *input, int N));
+void          initMosaicBins      PROTO((Catalog *catalog, int Ncatalog));
+void          initMosaicGrid      PROTO((Image *image, int Nimage));
+void          initMosaics         PROTO((Image *image, int Nimage));
+void          initMrel            PROTO((Catalog *catalog, int Ncatalog));
+void          initialize          PROTO((int argc, char **argv));
+void          initstats           PROTO((char *mode));
+int           liststats           PROTO((double *value, double *dvalue, int N, StatType *stats));
+Catalog      *load_catalogs       PROTO((GSCRegion *region, int Nregion, GSCRegion *fullregion));
+GSCRegion    *load_images         PROTO((char *seed, int *nregion, GSCRegion *fullregion));
+int           main                PROTO((int argc, char **argv));
+void          mark_images         PROTO((Image *image, int Nimage, Image *timage, int Ntimage));
+void          matchImage          PROTO((Catalog *catalog, int meas, int cat));
+void          matchMosaics        PROTO((Catalog *catalog, int meas, int cat));
+GSCRegion    *name_region         PROTO((char *name, int *Nregions));
+double        opening_angle       PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
+void          plot_chisq          PROTO((Catalog *catalog, int Ncatalog));
+void          plot_defaults       PROTO((Graphdata *graphdata));
+void          plot_grid           PROTO((Catalog *catalog));
+void          plot_images         PROTO(());
+void          plot_list           PROTO((Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *file));
+void          plot_mosaic_fields  PROTO((Catalog *catalog));
+void          plot_mosaics        PROTO(());
+void          plot_scatter        PROTO((Catalog *catalog, int Ncatalog));
+void          plot_star_coords    PROTO((Catalog *catalog, int Ncatalog));
+void          plot_stars          PROTO((Catalog *catalog, int Ncatalog));
+void          reload_catalogs     PROTO((GSCRegion *region, int Nregion, GSCRegion *fullregion));
+int           setExclusions       PROTO((Catalog *catalog, int Ncatalog));
+void          setMcal             PROTO((Catalog *catalog, int Poor));
+void          setMcalFinal        PROTO((Image *image, int Nimage));
+int           setMcalOutput       PROTO((Catalog *catalog, int Ncatalog));
+void          setMgrid            PROTO((Catalog *catalog));
+int           setMmos             PROTO((Catalog *catalog, int Poor));
+int           setMrel             PROTO((Catalog *catalog, int Ncatalog));
+void          setMrelFinal        PROTO((Catalog *catalog));
+int           setMrelOutput       PROTO((Catalog *catalog, int Ncatalog, int mark));
+void          set_ZP              PROTO((double ZERO));
+int           setrefcode          PROTO((Image *image, int Nimage)); 
+void          skip_measurements   PROTO((Catalog *catalog, int pass));
+void          sortA               PROTO((double *X, int N));
+void          sortB               PROTO((double *X, double *Y, int N));
+void          sortC               PROTO((double *X, double *Y, double *F1, double *F2, int N));
+void          sortD               PROTO((double *X, double *Y, double *Z, int N));
+StatType      statsImageM         PROTO((Catalog *catalog));
+StatType      statsImageN         PROTO((Catalog *catalog));
+StatType      statsImageX         PROTO((Catalog *catalog));
+StatType      statsImagedM        PROTO((Catalog *catalog));
+StatType      statsMosaicM        PROTO((Catalog *catalog));
+StatType      statsMosaicN        PROTO((Catalog *catalog));
+StatType      statsMosaicX        PROTO((Catalog *catalog));
+StatType      statsMosaicdM       PROTO((Catalog *catalog));
+StatType      statsStarN          PROTO((Catalog *catalog, int Ncatalog));
+StatType      statsStarS          PROTO((Catalog *catalog, int Ncatalog));
+StatType      statsStarX          PROTO((Catalog *catalog, int Ncatalog));
+void          wcatalog            PROTO((Catalog *catalog));
+void          wimages             PROTO(());
+void          write_coords        PROTO((Header *header, Coords *coords));
