Changeset 27839 for branches/simmosaic_branches/Ohana/src/opihi/include/dvoshell.h

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/include/dvoshell.h (modified) (14 diffs)

branches/simmosaic_branches/Ohana/src/opihi/include/dvoshell.h

@@ -27 +27 @@
       MAG_INST, 
       MAG_CAT, 
+      MAG_APER, 
       MAG_SYS, 
       MAG_REL, 
@@ -33 +34 @@
       MAG_REF, 
       MAG_ERR, 
+      MAG_AVE_ERR, 
       MAG_PHOT_FLAGS, 
       MAG_CHISQ,
@@ -67 +69 @@
       MEAS_RA_OFFSET_ERR, 
       MEAS_DEC_OFFSET_ERR, 
-      MEAS_XP, 
+      MEAS_CHISQ_POS, 
+      MEAS_CHISQ_PM,  
+      MEAS_CHISQ_PAR, 
+      MEAS_TMEAN, 
+      MEAS_TRANGE, 
       MEAS_NMEAS, 
       MEAS_NMISS, 
-      MEAS_OBJFLAGS, 
+      MEAS_NPOS, 
+      MEAS_OBJ_FLAGS, 
       MEAS_MAG, 
       MEAS_MINST, 
@@ -82 +89 @@
       MEAS_AZ, 
       MEAS_PHOTCODE, 
+      MEAS_PHOTCODE_EQUIV, 
       MEAS_TIME, 
       MEAS_FWHM, 
@@ -87 +95 @@
       MEAS_FWHM_MIN, 
       MEAS_THETA, 
+      MEAS_POSANGLE, 
+      MEAS_PLATESCALE, 
+      MEAS_MXX, 
+      MEAS_MXY, 
+      MEAS_MYY, 
       MEAS_DOPHOT, 
       MEAS_DB_FLAGS, 
@@ -104 +117 @@
       MEAS_PSF_QF, 
       MEAS_PSF_CHISQ, 
+      MEAS_PSF_NDOF,
+      MEAS_PSF_NPIX,
       MEAS_CR_NSIGMA, 
       MEAS_EXT_NSIGMA, 
@@ -124 +139 @@
       AVE_PAR, 
       AVE_PAR_ERR, 
+      AVE_CHISQ_POS, 
+      AVE_CHISQ_PM, 
+      AVE_CHISQ_PAR, 
+      AVE_TMEAN,
+      AVE_TRANGE, 
       AVE_Xp, 
       AVE_NMEAS, 
       AVE_NMISS, 
+      AVE_NPOS, 
       AVE_NPHOT, 
       AVE_NCODE, 
@@ -132 +153 @@
       AVE_dMAG, 
       AVE_Xm, 
-      AVE_FLAG, 
+      AVE_OBJ_FLAGS, 
       AVE_TYPE, 
       AVE_TYPEFRAC,
       AVE_OBJID,
-      AVE_CATID
+      AVE_CATID,
+      AVE_EXTID_HI,
+      AVE_EXTID_LO,
 };
 
@@ -157 +180 @@
       IMAGE_NCAL, 
       IMAGE_SKY, 
-      IMAGE_FLAG, 
+      IMAGE_FLAGS, 
       IMAGE_CCDNUM, 
       IMAGE_NX_PIX, 
@@ -257 +280 @@
 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));
+double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
+double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
+double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n));
+double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
+double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
+double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
 void          FreeImageSelection    PROTO((void));
 void          FreeImageSelection    PROTO((void));
@@ -277 +300 @@
 void          FreeDVO               PROTO((void));
 int           InitPhotcodes         PROTO((void));
-Image        *LoadImages            PROTO((int *Nimage));
+Image        *LoadImages            PROTO((off_t *Nimage));
 Image        *MatchImage            PROTO((unsigned int time, short int source));
 Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
@@ -291 +314 @@
 SkyRegionSelection *SetRegionSelection    PROTO((int *argc, char **argv));
 
+int           SkyRegionByPoint_r    PROTO((SkyTable *table, SkyList *list, int depth, double ra, double dec));
+SkyList      *SelectRegionsByCoordVectors PROTO((Vector *RA, Vector *DEC));
+
+int           find_matches_by_vectors PROTO((SkyRegion *region, Catalog *catalog, Vector *RAvec, Vector *DECvec, float RADIUS, off_t *index));
+
 int           SetImageSelection     PROTO((int mode, SkyRegionSelection *selection));
 int           SetPhotSelections     PROTO((int *argc, char **argv, int Nparams));
@@ -297 +325 @@
 int           TestPhotSelections    PROTO((PhotCode **code, int *mode, int param));
 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));
-void          image_subset          PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, SkyRegionSelection *selection, 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          cprecess              PROTO((Average *average, off_t Naverage, double in_epoch, double out_epoch));
+void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
+off_t         match_image           PROTO((Image *image, off_t Nimage, unsigned int T, short int S));
+off_t         match_image_subset    PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S));
 void          print_value           PROTO((double value, short int ival));
-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           PROTO((FILE *f, int *nstars));
-CMPstars     *cmpReadText           PROTO((FILE *f, int *nstars));
+CMPstars     *cmpReadFits           PROTO((FILE *f, off_t *nstars));
+CMPstars     *cmpReadText           PROTO((FILE *f, off_t *nstars));
 int           RD_to_XYpic           PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside));
 
@@ -331 +356 @@
 dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
 dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
-dbValue      dbExtractImages        PROTO((Image *image, int Nimage, int N, dbField *field));
+dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
 
 void         dbInitField            PROTO((dbField *field));