Index: trunk/Ohana/src/opihi/include/dvoshell.h =================================================================== --- trunk/Ohana/src/opihi/include/dvoshell.h (revision 31635) +++ trunk/Ohana/src/opihi/include/dvoshell.h (revision 33662) @@ -6,269 +6,4 @@ # ifndef DVOSHELL_H # define DVOSHELL_H - -#ifdef NOT_MOVED_TO_LIBDVO -typedef enum { - DB_STACK_NONE = 0, - DB_STACK_INT = 0x01, - DB_STACK_FIELD = 0x02, - DB_STACK_TEMP = 0x04, - DB_STACK_VALUE = 0x08, - DB_STACK_CLOSE_PAR = 0x10, - DB_STACK_OPEN_PAR, - DB_STACK_LOGIC, - DB_STACK_COMPARE, - DB_STACK_BITWISE, - DB_STACK_SUM, - DB_STACK_MULTIPLY, - DB_STACK_POWER, - DB_STACK_UNARY, -} dbStackTypes; - -/* magnitude types */ -enum {MAG_NONE, - MAG_INST, - MAG_CAT, - MAG_APER, - MAG_SYS, - MAG_REL, - MAG_CAL, - MAG_AVE, - MAG_REF, - MAG_ERR, - MAG_AVE_ERR, - MAG_PHOT_FLAGS, - MAG_CHISQ, - MAG_NCODE, - MAG_NPHOT, -}; - -/* measure fields */ -enum {MEAS_ZERO, - MEAS_GLON, - MEAS_GLAT, - MEAS_GLON_AVE, - MEAS_GLAT_AVE, - MEAS_ELON, - MEAS_ELAT, - MEAS_ELON_AVE, - MEAS_ELAT_AVE, - MEAS_RA, - MEAS_DEC, - MEAS_RA_AVE, - MEAS_DEC_AVE, - MEAS_RA_AVE_ERR, - MEAS_DEC_AVE_ERR, - MEAS_U_RA, - MEAS_U_DEC, - MEAS_U_RA_ERR, - MEAS_U_DEC_ERR, - MEAS_PAR, - MEAS_PAR_ERR, - MEAS_RA_OFFSET, - MEAS_DEC_OFFSET, - MEAS_RA_FIT_OFFSET, - MEAS_DEC_FIT_OFFSET, - MEAS_RA_OFFSET_ERR, - MEAS_DEC_OFFSET_ERR, - MEAS_CHISQ_POS, - MEAS_CHISQ_PM, - MEAS_CHISQ_PAR, - MEAS_TMEAN, - MEAS_TRANGE, - MEAS_NMEAS, - MEAS_NMISS, - MEAS_NPOS, - MEAS_OBJ_FLAGS, - MEAS_MAG, - MEAS_MINST, - MEAS_MCAT, - MEAS_MSYS, - MEAS_MREL, - MEAS_MCAL, - MEAS_EXPTIME, - MEAS_AIRMASS, - MEAS_ALT, - MEAS_AZ, - MEAS_PHOTCODE, - MEAS_PHOTCODE_EQUIV, - MEAS_TIME, - MEAS_FWHM, - MEAS_FWHM_MAJ, - MEAS_FWHM_MIN, - MEAS_THETA, - MEAS_POSANGLE, - MEAS_PLATESCALE, - MEAS_MXX, - MEAS_MXY, - MEAS_MYY, - MEAS_DOPHOT, - MEAS_DB_FLAGS, - MEAS_PHOT_FLAGS, - MEAS_XCCD, - MEAS_YCCD, - MEAS_XCCD_ERR, - MEAS_YCCD_ERR, - MEAS_POS_SYS_ERR, - MEAS_XMOSAIC, - MEAS_YMOSAIC, - MEAS_SKY, - MEAS_dSKY, - MEAS_DET_ID, - MEAS_OBJ_ID, - MEAS_CAT_ID, - MEAS_IMAGE_ID, - MEAS_PSF_QF, - MEAS_PSF_QF_PERFECT, - MEAS_PSF_CHISQ, - MEAS_PSF_NDOF, - MEAS_PSF_NPIX, - MEAS_CR_NSIGMA, - MEAS_EXT_NSIGMA, - MEAS_EXTERN_ID, -}; - -/* average fields */ -enum {AVE_ZERO, - AVE_RA, - AVE_DEC, - AVE_RA_ERR, - AVE_DEC_ERR, - AVE_GLON, - AVE_GLAT, - AVE_ELON, - AVE_ELAT, - AVE_U_RA, - AVE_U_DEC, - AVE_U_RA_ERR, - AVE_U_DEC_ERR, - 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, - AVE_MAG, - AVE_dMAG, - AVE_Xm, - AVE_OBJ_FLAGS, - AVE_TYPE, - AVE_TYPEFRAC, - AVE_OBJID, - AVE_CATID, - AVE_EXTID_HI, - AVE_EXTID_LO, -}; - -enum {IMAGE_ZERO, - IMAGE_RA, - IMAGE_DEC, - IMAGE_GLON, - IMAGE_GLAT, - IMAGE_ELON, - IMAGE_ELAT, - IMAGE_XM, - IMAGE_AIRMASS, - IMAGE_MCAL, - IMAGE_dMCAL, - IMAGE_PHOTCODE, - IMAGE_TIME, - IMAGE_FWHM, - IMAGE_FWHM_MEDIAN, - IMAGE_EXPTIME, - IMAGE_NSTAR, - IMAGE_NCAL, - IMAGE_SKY, - IMAGE_FLAGS, - IMAGE_CCDNUM, - IMAGE_NX_PIX, - IMAGE_NY_PIX, - IMAGE_THETA, - IMAGE_SKEW, - IMAGE_SCALE, - IMAGE_DSCALE, - IMAGE_APRESID, - IMAGE_DAPRESID, - IMAGE_SIDTIME, - IMAGE_LATITUDE, - IMAGE_DET_LIMIT, - IMAGE_SAT_LIMIT, - IMAGE_CERROR, - IMAGE_FWHM_MAJ, - IMAGE_FWHM_MIN, - IMAGE_FWHM_MAJ_MEDIAN, - IMAGE_FWHM_MIN_MEDIAN, - IMAGE_TRATE, - IMAGE_IMAGE_ID, - IMAGE_EXTERN_ID, - IMAGE_SOURCE_ID, - IMAGE_X_LL_CHIP, - IMAGE_X_LR_CHIP, - IMAGE_X_UL_CHIP, - IMAGE_X_UR_CHIP, - IMAGE_Y_LL_CHIP, - IMAGE_Y_LR_CHIP, - IMAGE_Y_UL_CHIP, - IMAGE_Y_UR_CHIP, - IMAGE_X_LL_FP, - IMAGE_X_LR_FP, - IMAGE_X_UL_FP, - IMAGE_X_UR_FP, - IMAGE_Y_LL_FP, - IMAGE_Y_LR_FP, - IMAGE_Y_UL_FP, - IMAGE_Y_UR_FP, - IMAGE_X_ERR_SYS, - IMAGE_Y_ERR_SYS, - IMAGE_MAG_ERR_SYS, - IMAGE_NFIT_PHOTOM, - IMAGE_NFIT_ASTROM, - IMAGE_NLINK_PHOTOM, - IMAGE_NLINK_ASTROM -}; - -enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE}; -enum {DVO_DB_CMDLINE_ERROR, DVO_DB_CMDLINE_IS_END, DVO_DB_CMDLINE_IS_WHERE, DVO_DB_CMDLINE_IS_MATCH}; - -// options for selecting the ra,dec limits of the db selections -typedef struct { - char *name; - char *list; - int useDisplay; - int useSkyregion; -} SkyRegionSelection; - -// a single db field -typedef struct { - char *name; - int extract; - int table; - int ID; - int magMode; - char type; - PhotCode *photcode; -} dbField; - -// db boolean operations -typedef struct { - char *name; - char type; - int field; - opihi_flt FltValue; - opihi_int IntValue; -} dbStack; - -typedef struct { - opihi_flt Flt; - opihi_int Int; -} dbValue; - -#endif // notdef MOVED_TO_LIBDVO typedef struct { @@ -291,4 +26,9 @@ e_time t; } CMPstars; + +/** some globals used particularly by DVO_CLIENT **/ +int HOST_ID; +char *HOSTDIR; +char *RESULT_FILE; /*** dvo prototypes ***/ @@ -316,13 +56,9 @@ void FreeDVO PROTO((void)); int InitPhotcodes PROTO((void)); -#ifdef NOT_MOVED_TO_DVO -Image *LoadImages PROTO((off_t *Nimage)); -void FreeImages PROTO((Image *images)); -Image *MatchImage PROTO((unsigned int time, short int source, unsigned int imageID)); -#endif Coords *MatchMosaic PROTO((unsigned int time, short int source)); 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 SetSkyRegions PROTO((SkyRegionSelection *selection)); SkyList *SelectRegions PROTO((SkyRegionSelection *selection)); SkyList *SkyListLoadFile PROTO((char *filename)); @@ -352,21 +88,5 @@ 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)); -int wordhash (char *word); - -#ifdef NOT_MOVED_TO_LIBDVO -// dvo DB field functions -dbField *dbCmdlineFields PROTO((int argc, char **argv, int table, int *last, int *nfields)); -int dbCmdlineConditions PROTO((int argc, char **argv, int first, int *nextField)); -dbStack *dbRPN PROTO((int argc, char **argv, int *nstack)); -int dbCheckStack PROTO((dbStack *stack, int Nstack, int table, dbField **inFields, int *Nfields)); -int dbBooleanCond PROTO((dbStack *inStack, int NinStack, dbValue *fields)); -void dbInitStack PROTO((dbStack *stack)); -void dbFreeStack PROTO((dbStack *stack, int Nstack)); -void dbFreeEntry PROTO((dbStack *stack)); -void dbFreeTempEntry PROTO((dbStack *stack)); - -dbStack *dbBinary PROTO((dbStack *V1, dbStack *V2, char *op, dbValue *fields)); -dbStack *dbUnary PROTO((dbStack *V1, char *op, dbValue *fields)); -#endif +int wordhash PROTO((char *word)); int GetMagMode PROTO((char *string)); @@ -378,31 +98,6 @@ dbValue dbExtractMeasures PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field)); dbValue dbExtractImages PROTO((Image *image, off_t Nimage, off_t N, dbField *field)); -#ifdef NOT_MOVED_TO_LIBDVO -dbValue dbExtractAverages PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field)); -void dbInitField PROTO((dbField *field)); -void dbFreeFields PROTO((dbField *fields, int Nfields)); -int dbAstroRegionLimits PROTO((dbStack **stack, int *nstack, SkyRegionSelection *selection, int table)); -int get_skyregion (double *Rs, double *Re, double *Ds, double *De); -int set_skyregion (double Rs, double Re, double Ds, double De); -void FreeImageSelection (void); -char *strfloat PROTO((float value)); - - -void FreeSkyRegionSelection (SkyRegionSelection *selection); - - -int dbExtractMeasuresInitTransform (CoordTransformSystem target); -int dbExtractMeasuresInitAve (void); -int dbExtractMeasuresInitMeas (void); -int dbExtractMeasuresInit (void); - -int dbExtractAveragesInitTransform (CoordTransformSystem target); -int dbExtractAveragesInit (void); - -int dbExtractImagesInitTransform (CoordTransformSystem target); -int dbExtractImagesInit (void); -int dbExtractImagesReset (void); -#endif // NOT_MOVED_TO_LIBDVO - +int HostTableLaunchJobs PROTO((HostTable *table, char *basecmd, char *options)); +int HostTableParallelOps PROTO((int argc, char **argv, char *ResultFile, int Nelements, int VERBOSE)); # endif