IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 3, 2010, 8:41:49 AM (16 years ago)
Author:
eugene
Message:

updates from trunk

Location:
branches/tap_branches
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/tap_branches

  • branches/tap_branches/Ohana

  • branches/tap_branches/Ohana/src/opihi/include/dvoshell.h

    r25056 r27838  
    3434      MAG_REF,
    3535      MAG_ERR,
     36      MAG_AVE_ERR,
    3637      MAG_PHOT_FLAGS,
    3738      MAG_CHISQ,
    … …  
    6869      MEAS_RA_OFFSET_ERR,
    6970      MEAS_DEC_OFFSET_ERR,
    70       MEAS_XP,
     71      MEAS_CHISQ_POS,
     72      MEAS_CHISQ_PM, 
     73      MEAS_CHISQ_PAR,
     74      MEAS_TMEAN,
     75      MEAS_TRANGE,
    7176      MEAS_NMEAS,
    7277      MEAS_NMISS,
    73       MEAS_OBJFLAGS,
     78      MEAS_NPOS,
     79      MEAS_OBJ_FLAGS,
    7480      MEAS_MAG,
    7581      MEAS_MINST,
    … …  
    8995      MEAS_FWHM_MIN,
    9096      MEAS_THETA,
     97      MEAS_POSANGLE,
     98      MEAS_PLATESCALE,
     99      MEAS_MXX,
     100      MEAS_MXY,
     101      MEAS_MYY,
    91102      MEAS_DOPHOT,
    92103      MEAS_DB_FLAGS,
    … …  
    106117      MEAS_PSF_QF,
    107118      MEAS_PSF_CHISQ,
     119      MEAS_PSF_NDOF,
     120      MEAS_PSF_NPIX,
    108121      MEAS_CR_NSIGMA,
    109122      MEAS_EXT_NSIGMA,
    … …  
    126139      AVE_PAR,
    127140      AVE_PAR_ERR,
     141      AVE_CHISQ_POS,
     142      AVE_CHISQ_PM,
     143      AVE_CHISQ_PAR,
     144      AVE_TMEAN,
     145      AVE_TRANGE,
    128146      AVE_Xp,
    129147      AVE_NMEAS,
    130148      AVE_NMISS,
     149      AVE_NPOS,
    131150      AVE_NPHOT,
    132151      AVE_NCODE,
    … …  
    134153      AVE_dMAG,
    135154      AVE_Xm,
    136       AVE_FLAG,
     155      AVE_OBJ_FLAGS,
    137156      AVE_TYPE,
    138157      AVE_TYPEFRAC,
    139158      AVE_OBJID,
    140       AVE_CATID
     159      AVE_CATID,
     160      AVE_EXTID_HI,
     161      AVE_EXTID_LO,
    141162};
    142163
    … …  
    159180      IMAGE_NCAL,
    160181      IMAGE_SKY,
    161       IMAGE_FLAG,
     182      IMAGE_FLAGS,
    162183      IMAGE_CCDNUM,
    163184      IMAGE_NX_PIX,
    … …  
    259280double        DetermineTypefrac     PROTO((Average *average, Measure *measure, PhotCode *code));
    260281double        ExtractAverages       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param));
    261 double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    262 double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
    263 double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n));
    264 double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    265 double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    266 double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
     282double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     283double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
     284double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n));
     285double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     286double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     287double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
    267288void          FreeImageSelection    PROTO((void));
    268289void          FreeImageSelection    PROTO((void));
    … …  
    279300void          FreeDVO               PROTO((void));
    280301int           InitPhotcodes         PROTO((void));
    281 Image        *LoadImages            PROTO((int *Nimage));
     302Image        *LoadImages            PROTO((off_t *Nimage));
    282303Image        *MatchImage            PROTO((unsigned int time, short int source));
    283304Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
    … …  
    293314SkyRegionSelection *SetRegionSelection    PROTO((int *argc, char **argv));
    294315
     316int           SkyRegionByPoint_r    PROTO((SkyTable *table, SkyList *list, int depth, double ra, double dec));
     317SkyList      *SelectRegionsByCoordVectors PROTO((Vector *RA, Vector *DEC));
     318
     319int           find_matches_by_vectors PROTO((SkyRegion *region, Catalog *catalog, Vector *RAvec, Vector *DECvec, float RADIUS, off_t *index));
     320
    295321int           SetImageSelection     PROTO((int mode, SkyRegionSelection *selection));
    296322int           SetPhotSelections     PROTO((int *argc, char **argv, int Nparams));
    … …  
    299325int           TestPhotSelections    PROTO((PhotCode **code, int *mode, int param));
    300326void          compare               PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius));
    301 void          cprecess              PROTO((Average *average, int Naverage, double in_epoch, double out_epoch));
    302 void          image_subset          PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
    303 int           match_image           PROTO((Image *image, int Nimage, unsigned int T, short int S));
    304 int           match_image_subset    PROTO((Image *image, int *subset, int Nsubset, unsigned int T, short int S));
     327void          cprecess              PROTO((Average *average, off_t Naverage, double in_epoch, double out_epoch));
     328void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
     329off_t         match_image           PROTO((Image *image, off_t Nimage, unsigned int T, short int S));
     330off_t         match_image_subset    PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S));
    305331void          print_value           PROTO((double value, short int ival));
    306 void          sort_image_subset     PROTO((Image *image, int *subset, int N));
    307 void          sort_images           PROTO((Image *image, int N));
    308 void          sortave               PROTO((Average *ave, int N));
    309 CMPstars     *cmpReadFits           PROTO((FILE *f, int *nstars));
    310 CMPstars     *cmpReadText           PROTO((FILE *f, int *nstars));
     332CMPstars     *cmpReadFits           PROTO((FILE *f, off_t *nstars));
     333CMPstars     *cmpReadText           PROTO((FILE *f, off_t *nstars));
    311334int           RD_to_XYpic           PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside));
    312335
    … …  
    333356dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    334357dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    335 dbValue      dbExtractImages        PROTO((Image *image, int Nimage, int N, dbField *field));
     358dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
    336359
    337360void         dbInitField            PROTO((dbField *field));
Note: See TracChangeset for help on using the changeset viewer.