Index: /trunk/Ohana/src/opihi/cmd.astro/objload.c =================================================================== --- /trunk/Ohana/src/opihi/cmd.astro/objload.c (revision 3461) +++ /trunk/Ohana/src/opihi/cmd.astro/objload.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # define CHAR_LINE 104 # define NBLOCK 100 Index: /trunk/Ohana/src/opihi/dimm/init.c =================================================================== --- /trunk/Ohana/src/opihi/dimm/init.c (revision 3461) +++ /trunk/Ohana/src/opihi/dimm/init.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dimm.h" int altaz PROTO((int, char **)); Index: /trunk/Ohana/src/opihi/dvo/ImageOps.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/ImageOps.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/ImageOps.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" void image_subset (Image *image, int Nimage, int **Subset, int *Nsubset, Index: /trunk/Ohana/src/opihi/dvo/LoadImages.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/LoadImages.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/LoadImages.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" Image *LoadImages (int *nimage) { Index: /trunk/Ohana/src/opihi/dvo/addxtra.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/addxtra.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/addxtra.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" typedef struct { Index: /trunk/Ohana/src/opihi/dvo/aregion.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/aregion.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/aregion.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # include "hstgsc.h" Index: /trunk/Ohana/src/opihi/dvo/avextract.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/avextract.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/avextract.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int avextract (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/badimages.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/badimages.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/badimages.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" static int badim_int = FALSE; Index: /trunk/Ohana/src/opihi/dvo/calextract.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/calextract.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/calextract.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" enum {Nd, Nm, NC, NR, ND, Np, Nc, Nt, Nx, Nd1, Nd2, NVEC}; Index: /trunk/Ohana/src/opihi/dvo/calmextract.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/calmextract.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/calmextract.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" enum {Nd, Nm1, Nm2, Nc, Ns, Nt, Nz, NR, ND, Nxc, Nyc, Nxm, Nym, NT, NP, Nd1, Nd2, NVEC}; Index: /trunk/Ohana/src/opihi/dvo/catalog.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/catalog.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/catalog.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # define NBYTES 160000 # define BYTES_STAR 23 @@ -15,5 +15,5 @@ Vector Xvec, Yvec, Zvec; int i, N, Nm, Nn, NN, Nbytes, nbytes, Bytes_Star; - int Ar, Ad, Am, InRegion, GSC, ASCII, LONEOS, FIXED; + int Ar, Ad, Am, InRegion, GSC, ASCII, DVO, FIXED; char filename[128]; double Mz, Mr, Nz, Nr; @@ -128,5 +128,5 @@ ASCII = FALSE; - LONEOS = TRUE; + DVO = TRUE; GSC = FALSE; FIXED = FALSE; @@ -135,5 +135,5 @@ GSC = TRUE; ASCII = FALSE; - LONEOS = FALSE; + DVO = FALSE; } @@ -142,5 +142,5 @@ ASCII = TRUE; GSC = FALSE; - LONEOS = FALSE; + DVO = FALSE; Ar = atof(argv[N]); remove_argument (N, &argc, argv); @@ -303,5 +303,5 @@ /* load data from the photometry database files */ - if (LONEOS) { + if (DVO) { if (InRegion) { Index: /trunk/Ohana/src/opihi/dvo/ccd.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/ccd.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/ccd.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int ccd (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/cmatch.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/cmatch.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/cmatch.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # define BYTES_STAR 23 # define BLOCK 1000 Index: /trunk/Ohana/src/opihi/dvo/cmd.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/cmd.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/cmd.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int cmd (int argc, char **argv) { /* really need to think about upper limits & how to represent them */ Index: /trunk/Ohana/src/opihi/dvo/cmpload.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/cmpload.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/cmpload.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # define D_NSTARS 1000 # define BYTES_STAR 66 Index: /trunk/Ohana/src/opihi/dvo/cmpread.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/cmpread.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/cmpread.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # define D_NSTARS 1000 # define BYTES_STAR 66 Index: /trunk/Ohana/src/opihi/dvo/compare.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/compare.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/compare.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # define D_NMATCH 500; Index: /trunk/Ohana/src/opihi/dvo/ddmags.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/ddmags.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/ddmags.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int ddmags (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/detrend.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/detrend.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/detrend.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" /* qualities to be extracted */ Index: /trunk/Ohana/src/opihi/dvo/dmagaves.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/dmagaves.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/dmagaves.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int dmagaves (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/dmagmeas.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/dmagmeas.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/dmagmeas.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param); Index: /trunk/Ohana/src/opihi/dvo/dmags.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/dmags.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/dmags.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int dmags (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/dmt.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/dmt.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/dmt.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" /* extract vectors giving delta mags for multiple measurements */ Index: /trunk/Ohana/src/opihi/dvo/dvomisc.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/dvomisc.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/dvomisc.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" void cprecess (Average *average, int Naverage, double in_epoch, double out_epoch) { Index: /trunk/Ohana/src/opihi/dvo/elixir.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/elixir.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/elixir.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int elixir (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/extract.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/extract.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/extract.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" enum {ZERO, RA, DEC, MAG, dMAG, Xm, Xp, NMEAS, NMISS, REF, TYPE, NPHOT, NCODE, FLAG}; Index: /trunk/Ohana/src/opihi/dvo/find_regions.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/find_regions.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/find_regions.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # include "hstgsc.h" Index: /trunk/Ohana/src/opihi/dvo/gcat.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/gcat.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/gcat.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int gcat (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/get_regions.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/get_regions.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/get_regions.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" /* return region files containing given image */ Index: /trunk/Ohana/src/opihi/dvo/getxtra.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/getxtra.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/getxtra.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int getxtra (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/gimages.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/gimages.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/gimages.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int gimages (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/gstar.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/gstar.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/gstar.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" void print_value (FILE *f, double value, short int ival); Index: /trunk/Ohana/src/opihi/dvo/images.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/images.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/images.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int images (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/imbox.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imbox.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imbox.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int imbox (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/imdata.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imdata.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imdata.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" void copy_region (GSCRegion *in, GSCRegion *out); Index: /trunk/Ohana/src/opihi/dvo/imdense.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imdense.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imdense.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" extern double drand48(); Index: /trunk/Ohana/src/opihi/dvo/imextract.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imextract.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imextract.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" enum {ZERO, RA, DEC, Xm, AIRMASS, MCAL, dMCAL, PHOTCODE, TIME, FWHM, EXPTIME, NSTAR, SKY, NCAL, FLAG}; Index: /trunk/Ohana/src/opihi/dvo/imlist.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imlist.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imlist.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int imlist (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/imphot.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imphot.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imphot.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int imphot (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/imrough.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imrough.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imrough.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" RegImage *load_imreg (char *DataBase, int *nimage); Index: /trunk/Ohana/src/opihi/dvo/imsearch.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imsearch.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imsearch.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" imsearch (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/imstats.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/imstats.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/imstats.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int imstats (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/lcat.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/lcat.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/lcat.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int lcat (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/lcurve.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/lcurve.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/lcurve.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int lcurve (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/match_image.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/match_image.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/match_image.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int match_image (Image *image, int Nimage, unsigned int T, short int S) { Index: /trunk/Ohana/src/opihi/dvo/mextract.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/mextract.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/mextract.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int mextract (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/pcat.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/pcat.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/pcat.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int pcat (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/photcodes.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/photcodes.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/photcodes.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" /* list or return all photcodes equivalent to the given filter */ Index: /trunk/Ohana/src/opihi/dvo/photometry.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/photometry.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/photometry.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" /* match code to measure */ Index: /trunk/Ohana/src/opihi/dvo/pmeasure.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/pmeasure.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/pmeasure.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int pmeasure (int argc, char **argv) { Index: /trunk/Ohana/src/opihi/dvo/procks.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/procks.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/procks.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" typedef struct { Index: /trunk/Ohana/src/opihi/dvo/region_list.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/region_list.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/region_list.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" /* returns a list of region files names from file */ Index: /trunk/Ohana/src/opihi/dvo/showtile.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/showtile.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/showtile.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" static float dr[] = {0.0, 1.0, 1.0, 0.0}; static float dd[] = {0.0, 0.0, 1.0, 1.0}; Index: /trunk/Ohana/src/opihi/dvo/simage.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/simage.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/simage.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" # define D_NSTARS 1000 # define BYTES_STAR 31 Index: /trunk/Ohana/src/opihi/dvo/subpix.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/subpix.c (revision 3461) +++ /trunk/Ohana/src/opihi/dvo/subpix.c (revision 3462) @@ -1,3 +1,3 @@ -# include "dvo.h" +# include "dvo1.h" int bracket (double *list, double value, int Nlist, int mode); Index: unk/Ohana/src/opihi/include/dvo.h =================================================================== --- /trunk/Ohana/src/opihi/include/dvo.h (revision 3461) +++ (revision ) @@ -1,63 +1,0 @@ -# include "external.h" -# include "shell.h" -# include "dvomath.h" -# include "convert.h" -# include "display.h" -# include "data.h" - -# ifndef DVO_H -# define DVO_H - -/* magnitude types */ -enum {MAG_NONE, MAG_INST, MAG_CAT, MAG_SYS, MAG_REL, MAG_CAL, MAG_AVE, MAG_REF}; - -/* measure params */ -enum {MEAS_ZERO, MEAS_RA, MEAS_DEC, MEAS_MAG, MEAS_dMAG, MEAS_MINST, MEAS_MCAT, - MEAS_MSYS, MEAS_MREL, MEAS_MCAL, MEAS_PHOTCODE, MEAS_TIME, MEAS_dR, MEAS_dD, - MEAS_FWHM, MEAS_DOPHOT, MEAS_XCCD, MEAS_YCCD, MEAS_XMOSAIC, MEAS_YMOSAIC, MEAS_FLAGS, MEAS_EXPTIME, MEAS_AIRMASS}; - -/* average params */ -enum {AVE_ZERO, AVE_RA, AVE_DEC, AVE_MAG, AVE_REF, AVE_dMAG, AVE_Xm, AVE_Xp, AVE_NMEAS, - AVE_NMISS, AVE_TYPE, AVE_NPHOT, AVE_NCODE, AVE_NCRIT, AVE_FLAG}; - -typedef struct { - char name[64]; - double RA0, RA1, DEC0, DEC1; -} 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 ***/ -int SetPhotSelections PROTO((int *argc, char **argv)); -int SetImageSelection PROTO((int mode, Graphdata *graphsky, int state)); -void FreeImageSelection PROTO(()); - -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)); - -# endif Index: /trunk/Ohana/src/opihi/include/dvo1.h =================================================================== --- /trunk/Ohana/src/opihi/include/dvo1.h (revision 3462) +++ /trunk/Ohana/src/opihi/include/dvo1.h (revision 3462) @@ -0,0 +1,63 @@ +# include "external.h" +# include "shell.h" +# include "dvomath.h" +# include "convert.h" +# include "display.h" +# include "data.h" + +# ifndef DVO_H +# define DVO_H + +/* magnitude types */ +enum {MAG_NONE, MAG_INST, MAG_CAT, MAG_SYS, MAG_REL, MAG_CAL, MAG_AVE, MAG_REF}; + +/* measure params */ +enum {MEAS_ZERO, MEAS_RA, MEAS_DEC, MEAS_MAG, MEAS_dMAG, MEAS_MINST, MEAS_MCAT, + MEAS_MSYS, MEAS_MREL, MEAS_MCAL, MEAS_PHOTCODE, MEAS_TIME, MEAS_dR, MEAS_dD, + MEAS_FWHM, MEAS_DOPHOT, MEAS_XCCD, MEAS_YCCD, MEAS_XMOSAIC, MEAS_YMOSAIC, MEAS_FLAGS, MEAS_EXPTIME, MEAS_AIRMASS}; + +/* average params */ +enum {AVE_ZERO, AVE_RA, AVE_DEC, AVE_MAG, AVE_REF, AVE_dMAG, AVE_Xm, AVE_Xp, AVE_NMEAS, + AVE_NMISS, AVE_TYPE, AVE_NPHOT, AVE_NCODE, AVE_NCRIT, AVE_FLAG}; + +typedef struct { + char name[64]; + double RA0, RA1, DEC0, DEC1; +} 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 ***/ +int SetPhotSelections PROTO((int *argc, char **argv)); +int SetImageSelection PROTO((int mode, Graphdata *graphsky, int state)); +void FreeImageSelection PROTO(()); + +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)); + +# endif Index: /trunk/Ohana/src/opihi/include/external.h =================================================================== --- /trunk/Ohana/src/opihi/include/external.h (revision 3461) +++ /trunk/Ohana/src/opihi/include/external.h (revision 3462) @@ -12,5 +12,5 @@ # include # include -# include +# include /* provide missing external defines */