Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvo.h =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvo.h (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvo.h (revision 36908) @@ -662,29 +662,14 @@ char *GetPhotcodeNamebyCode (int code); -float PhotInst (Measure *measure); -float PhotCat (Measure *measure); -float PhotSys (Measure *measure, Average *average, SecFilt *secfilt); -float PhotRel (Measure *measure, Average *average, SecFilt *secfilt); -float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); -float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt); -float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); -float PhotAveErr (PhotCode *code, Average *average, SecFilt *secfilt); - -float PhotAperInst (Measure *measure); -float PhotAperCat (Measure *measure); -float PhotAperSys (Measure *measure, Average *average, SecFilt *secfilt); -float PhotAperRel (Measure *measure, Average *average, SecFilt *secfilt); -float PhotAperCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); -float PhotAperAve (PhotCode *code, Average *average, SecFilt *secfilt); -float PhotAperRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); - -float PhotKronInst (Measure *measure); -float PhotKronCat (Measure *measure); -float PhotKronSys (Measure *measure, Average *average, SecFilt *secfilt); -float PhotKronRel (Measure *measure, Average *average, SecFilt *secfilt); -float PhotKronCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); -float PhotKronAve (PhotCode *code, Average *average, SecFilt *secfilt); -float PhotKronRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); -float PhotKronAveErr (PhotCode *code, Average *average, SecFilt *secfilt); +float PhotInst (Measure *measure, dvoMagClassType class); +float PhotCat (Measure *measure, dvoMagClassType class); +float PhotSys (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class); +float PhotRel (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class); +float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code, dvoMagClassType class); +float PhotErr (Measure *measure, dvoMagClassType class); + +float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source); +float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure, dvoMagClassType class, dvoMagSourceType source); +float PhotAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source); float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt); Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvodb.h =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvodb.h (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvodb.h (revision 36908) @@ -22,5 +22,50 @@ /* magnitude types */ -enum {MAG_NONE, + +typedef enum { + MAG_SRC_NONE, + MAG_SRC_CHP, + MAG_SRC_WRP, + MAG_SRC_STK, +} dvoMagSourceType; + +typedef enum { + MAG_LEVEL_NONE, // -2.5*log(DN) [ie, not DN/sec] + MAG_LEVEL_INST, // -2.5*log(DN) [ie, not DN/sec] + MAG_LEVEL_CAT, // MAG_INST + 2.5*log(exptime) + C_lambda + K_lambda*(airmass - 1) + MAG_LEVEL_SYS, // MAG_CAT + \sum_i A_i * (color_i - color_o) [color correction for measure photcode] + MAG_LEVEL_REL, // MAG_SYS - Mcal [specific zero point for image] + MAG_LEVEL_CAL, // MAG_REL + \sum_i A_i * (color_i - color_o) [color correction for average photcode] + MAG_LEVEL_AVE, + MAG_LEVEL_REF, +} dvoMagLevelType; + +typedef enum { + MAG_OPTION_NONE, + MAG_OPTION_MAG, + MAG_OPTION_FLUX, + MAG_OPTION_FLUX_ERR, + MAG_OPTION_ERR, + MAG_OPTION_STDEV, + MAG_OPTION_CHISQ, + MAG_OPTION_MIN, + MAG_OPTION_MAX, + MAG_OPTION_NCODE, + MAG_OPTION_NPHOT, // Nused + MAG_OPTION_UC_DIST, + MAG_OPTION_STACK_DET_ID, + MAG_OPTION_FLAGS, +} dvoMagOptionType; + +typedef enum { + MAG_CLASS_NONE, + MAG_CLASS_PSF, + MAG_CLASS_KRON, + MAG_CLASS_APER, +} dvoMagClassType; + +# if (0) +enum { + MAG_NONE, // these magnitude types are from the measurement table (or derived therein) @@ -53,6 +98,4 @@ // these magnitude types are from the average (secfilt) table: // the following imply PSF magnitudes (or fluxes) - MAG_AVE, - MAG_REF, MAG_STDEV, MAG_AVE_ERR, @@ -79,5 +122,6 @@ MAG_UC_DIST, MAG_STACK_DET_ID, -}; +} ; +# endif /* measure fields */ @@ -173,11 +217,7 @@ MEAS_EXTERN_ID, MEAS_EXPNAME_AS_INT, - MEAS_MCAL_OFFSET, + MEAS_MCAL_OFFSET, // make this a dvoMagOption? MEAS_FLAT, MEAS_CENTER_OFFSET, - MEAS_FLUX_PSF, - MEAS_FLUX_PSF_ERR, - MEAS_FLUX_KRON, - MEAS_FLUX_KRON_ERR, MEAS_REF_COLOR, }; @@ -312,5 +352,10 @@ int table; int ID; - int magMode; + + dvoMagSourceType magSource; // chip, (forced) warp, stack [only relevant for averages] + dvoMagLevelType magLevel; // inst, cat, sys, rel, ave, ref, err, min, max, stdev, nphot, chisq, + dvoMagOptionType magOption; // psf, kron, aper + dvoMagClassType magClass; + char type; PhotCode *photcode; @@ -374,5 +419,5 @@ int GetMagMode PROTO((char *string)); -PhotCode *ParsePhotcodeField PROTO((char *field, int *mode, int def)); +int ParsePhotcodeField PROTO((dbField *field, char *fieldName)); int ParseMeasureField PROTO((dbField *field, char *fieldName)); int ParseAverageField PROTO((dbField *field, char *fieldName)); Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/LoadPhotcodesFITS.c =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/LoadPhotcodesFITS.c (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/LoadPhotcodesFITS.c (revision 36908) @@ -101,4 +101,10 @@ // photcode.equiv of 0 means "undefined" for (i = 0; i < Ncode; i++) { + if (!strcasecmp(photcode[i].name, "MAG")) { + fprintf (stderr, "MAG is not an allowed photcode name (reserved to DVO internals)\n"); + free (photcode); + return FALSE; + } + if (photcode[i].type == PHOT_DEP) { if (photcode[i].equiv == 0) continue; Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/LoadPhotcodesText.c =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/LoadPhotcodesText.c (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/LoadPhotcodesText.c (revision 36908) @@ -106,4 +106,9 @@ fprintf (stderr, "photcode values may not be 0: fix %s\n", name); return (FALSE); + } + + if (!strcasecmp(name, "MAG")) { + fprintf (stderr, "MAG is not an allowed photcode name (reserved to DVO internals)\n"); + return FALSE; } Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractAverages.c =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractAverages.c (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractAverages.c (revision 36908) @@ -52,6 +52,5 @@ dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) { - off_t i; - int Nsec; + // off_t i; dbValue value; @@ -182,4 +181,5 @@ break; +# if (0) case AVE_MAG: switch (field->magMode) { @@ -228,5 +228,5 @@ } } else { - Nsec = GetPhotcodeNsec (field->photcode->code); + int Nsec = GetPhotcodeNsec (field->photcode->code); if (Nsec == -1) break; value.Int = secfilt[Nsec].flags; @@ -236,10 +236,10 @@ // XXX push these into dvo_photcode_ops APIs // XXX do I need to allow for conversion to equiv? - Nsec = GetPhotcodeNsec (field->photcode->code); + int Nsec = GetPhotcodeNsec (field->photcode->code); if (Nsec == -1) break; value.Int = secfilt[Nsec].Ncode; break; case MAG_NPHOT: - Nsec = GetPhotcodeNsec (field->photcode->code); + int Nsec = GetPhotcodeNsec (field->photcode->code); if (Nsec == -1) break; value.Int = secfilt[Nsec].Nused; @@ -301,4 +301,5 @@ value.Flt = PhotXm (field->photcode, average, secfilt); break; +# endif case AVE_TYPE: break; Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractMeasures.c =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractMeasures.c (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractMeasures.c (revision 36908) @@ -117,28 +117,11 @@ // if we ask for g:ave, or other SEC-level values, return the corresponding field if (field->photcode->type == PHOT_SEC) { - switch (field->magMode) { + switch (field->magLevel) { // measure-like : return non-NAN if measure.equiv.photcode matches field.photcode - case MAG_INST: - case MAG_CAT: - case MAG_SYS: - case MAG_REL: - case MAG_CAL: - case MAG_ERR: - - case MAG_APER_INST: - case MAG_APER_CAT: - case MAG_APER_SYS: - case MAG_APER_REL: - case MAG_APER_CAL: - case MAG_APER_ERR: - - case MAG_KRON_INST: - case MAG_KRON_CAT: - case MAG_KRON_SYS: - case MAG_KRON_REL: - case MAG_KRON_CAL: - case MAG_KRON_ERR: - - case MAG_PHOT_FLAGS: + case MAG_LEVEL_INST: + case MAG_LEVEL_CAT: + case MAG_LEVEL_SYS: + case MAG_LEVEL_REL: + case MAG_LEVEL_CAL: equiv = myEquiv; if (equiv && (equiv->code == field->photcode->code)) goto valid_photcode; @@ -146,26 +129,6 @@ // mean-like : return value for the given photcode - case MAG_AVE: - case MAG_REF: - case MAG_STDEV: - case MAG_AVE_ERR: - case MAG_CHISQ: - - case MAG_FLUX_PSF: - case MAG_FLUX_PSF_ERR: - - case MAG_APER_AVE: - - case MAG_KRON_AVE: - case MAG_FLUX_KRON: - case MAG_FLUX_KRON_ERR: - - case MAG_MIN: - case MAG_MAX: - case MAG_UC_DIST: - case MAG_STACK_DET_ID: - - case MAG_NCODE: - case MAG_NPHOT: + case MAG_LEVEL_AVE: + case MAG_LEVEL_REF: equiv = field->photcode; goto valid_photcode; @@ -179,131 +142,62 @@ valid_photcode: - switch (field->magMode) { - case MAG_INST: - value.Flt = PhotInst (measure); - break; - case MAG_CAT: - value.Flt = PhotCat (measure); - break; - case MAG_SYS: - value.Flt = PhotSys (measure, average, secfilt); - break; - case MAG_REL: - value.Flt = PhotRel (measure, average, secfilt); - break; - case MAG_CAL: - value.Flt = PhotCal (measure, average, secfilt, measure, equiv); - break; - case MAG_AVE: - value.Flt = PhotAve (equiv, average, secfilt); - break; - case MAG_REF: - value.Flt = PhotRef (equiv, average, secfilt, measure); - break; - case MAG_ERR: - value.Flt = measure[0].dM; - break; - case MAG_AVE_ERR: - value.Flt = PhotAveErr (equiv, average, secfilt); - break; - - case MAG_APER_INST: - value.Flt = PhotAperInst (measure); - break; - case MAG_APER_CAT: - value.Flt = PhotAperCat (measure); - break; - case MAG_APER_SYS: - value.Flt = PhotAperSys (measure, average, secfilt); - break; - case MAG_APER: - case MAG_APER_REL: - value.Flt = PhotAperRel (measure, average, secfilt); - break; - case MAG_APER_CAL: - value.Flt = PhotAperCal (measure, average, secfilt, measure, equiv); - break; - case MAG_APER_AVE: - value.Flt = PhotAperAve (equiv, average, secfilt); - break; - case MAG_APER_REF: - value.Flt = PhotAperRef (equiv, average, secfilt, measure); - break; - case MAG_APER_ERR: - value.Flt = measure[0].dM; - break; - - case MAG_KRON_INST: - value.Flt = PhotKronInst (measure); - break; - case MAG_KRON_CAT: - value.Flt = PhotKronCat (measure); - break; - case MAG_KRON_SYS: - value.Flt = PhotKronSys (measure, average, secfilt); - break; - case MAG_KRON: - case MAG_KRON_REL: - value.Flt = PhotKronRel (measure, average, secfilt); - break; - case MAG_KRON_CAL: - value.Flt = PhotKronCal (measure, average, secfilt, measure, equiv); - break; - case MAG_KRON_AVE: - value.Flt = PhotKronAve (equiv, average, secfilt); - break; - case MAG_KRON_REF: - value.Flt = PhotKronRef (equiv, average, secfilt, measure); - break; - case MAG_KRON_ERR: - value.Flt = measure[0].dMkron; - break; - - case MAG_PHOT_FLAGS: - if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) { - value.Int = measure[0].photFlags; + switch (field->magOption) { + case MAG_OPTION_MAG: + switch (field->magLevel) { + case MAG_LEVEL_INST: + value.Flt = PhotInst (measure, field->magClass); + break; + case MAG_LEVEL_CAT: + value.Flt = PhotCat (measure, field->magClass); + break; + case MAG_LEVEL_SYS: + value.Flt = PhotSys (measure, average, secfilt, field->magClass); + break; + case MAG_LEVEL_REL: + value.Flt = PhotRel (measure, average, secfilt, field->magClass); + break; + case MAG_LEVEL_CAL: + value.Flt = PhotCal (measure, average, secfilt, measure, equiv, field->magClass); + break; + case MAG_LEVEL_AVE: + value.Flt = PhotAve (equiv, average, secfilt, field->magClass, field->magSource); + break; + case MAG_LEVEL_REF: + value.Flt = PhotRef (equiv, average, secfilt, measure, field->magClass, field->magSource); + break; + case MAG_LEVEL_NONE: + break; } break; - - case MAG_NCODE: - if (equiv == NULL) break; - Nsec = GetPhotcodeNsec (equiv->code); - if (Nsec == -1) break; - value.Int = secfilt[Nsec].Ncode; + case MAG_OPTION_ERR: + switch (field->magLevel) { + case MAG_LEVEL_INST: + case MAG_LEVEL_CAT: + case MAG_LEVEL_SYS: + case MAG_LEVEL_REL: + case MAG_LEVEL_CAL: + value.Flt = PhotErr (measure, field->magClass); + break; + case MAG_LEVEL_AVE: + case MAG_LEVEL_REF: + value.Flt = PhotAveErr (equiv, average, secfilt, field->magClass, field->magSource); + break; + case MAG_LEVEL_NONE: + break; + } break; - case MAG_NPHOT: - if (equiv == NULL) break; - Nsec = GetPhotcodeNsec (equiv->code); - if (Nsec == -1) break; - value.Int = secfilt[Nsec].Nused; - break; - - case MAG_CHISQ: - value.Flt = PhotXm (equiv, average, secfilt); - break; - case MAG_STDEV: - value.Flt = PhotMstdev (equiv, average, secfilt); - break; - case MAG_MIN: - value.Flt = PhotMmin (equiv, average, secfilt); - break; - case MAG_MAX: - value.Flt = PhotMmax (equiv, average, secfilt); - break; - case MAG_UC_DIST: - value.Flt = PhotUCdist (equiv, average, secfilt); - break; - - case MAG_FLUX_PSF: - value.Flt = PhotAveFluxPSF (field->photcode, average, secfilt); - break; - case MAG_FLUX_PSF_ERR: - value.Flt = PhotAvedFluxPSF (field->photcode, average, secfilt); - break; - case MAG_FLUX_KRON: - value.Flt = PhotAveFluxKron (field->photcode, average, secfilt); - break; - case MAG_FLUX_KRON_ERR: - value.Flt = PhotAvedFluxKron (field->photcode, average, secfilt); + + case MAG_OPTION_FLUX: + case MAG_OPTION_FLUX_ERR: + case MAG_OPTION_STDEV: + case MAG_OPTION_CHISQ: + case MAG_OPTION_MIN: + case MAG_OPTION_MAX: + case MAG_OPTION_NCODE: + case MAG_OPTION_NPHOT: + case MAG_OPTION_UC_DIST: + case MAG_OPTION_STACK_DET_ID: + case MAG_OPTION_FLAGS: + case MAG_OPTION_NONE: break; } @@ -777,16 +671,16 @@ break; - case MEAS_FLUX_PSF: /* OK */ - value.Flt = measure[0].FluxPSF; - break; - case MEAS_FLUX_PSF_ERR: /* OK */ - value.Flt = measure[0].dFluxPSF; - break; - case MEAS_FLUX_KRON: /* OK */ - value.Flt = measure[0].FluxKron; - break; - case MEAS_FLUX_KRON_ERR: /* OK */ - value.Flt = measure[0].dFluxKron; - break; + // case MEAS_FLUX_PSF: /* OK */ + // value.Flt = measure[0].FluxPSF; + // break; + // case MEAS_FLUX_PSF_ERR: /* OK */ + // value.Flt = measure[0].dFluxPSF; + // break; + // case MEAS_FLUX_KRON: /* OK */ + // value.Flt = measure[0].FluxKron; + // break; + // case MEAS_FLUX_KRON_ERR: /* OK */ + // value.Flt = measure[0].dFluxKron; + // break; } return (value); Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbFields.c =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbFields.c (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbFields.c (revision 36908) @@ -9,9 +9,4 @@ for (i = 0; i < Nfields; i++) { if (fields[i].name != NULL) free (fields[i].name); - if (fields[i].photcode != NULL) { - if (fields[i].photcode[0].type == PHOT_MAG) { - free (fields[i].photcode); - } - } } free (fields); @@ -24,8 +19,69 @@ field->ID = 0; field->type = OPIHI_FLT; - field->magMode = 0; + + field->magSource = MAG_SRC_NONE; + field->magLevel = MAG_LEVEL_NONE; + field->magClass = MAG_CLASS_NONE; + field->magOption = MAG_OPTION_NONE; + field->photcode = NULL; } +dvoMagSourceType GetMagSource (char *string) { + + if (!strcasecmp (string, "chip")) return (MAG_SRC_CHP); + if (!strcasecmp (string, "warp")) return (MAG_SRC_WRP); + if (!strcasecmp (string, "stack")) return (MAG_SRC_STK); + + if (!strcasecmp (string, "chp")) return (MAG_SRC_CHP); + if (!strcasecmp (string, "wrp")) return (MAG_SRC_WRP); + if (!strcasecmp (string, "stk")) return (MAG_SRC_STK); + + return MAG_SRC_NONE; +} + +dvoMagLevelType GetMagLevel (char *string) { + + if (!strcasecmp (string, "inst")) return (MAG_LEVEL_INST); + if (!strcasecmp (string, "cat")) return (MAG_LEVEL_CAT); + if (!strcasecmp (string, "sys")) return (MAG_LEVEL_SYS); + if (!strcasecmp (string, "rel")) return (MAG_LEVEL_REL); + if (!strcasecmp (string, "cal")) return (MAG_LEVEL_CAL); + if (!strcasecmp (string, "ave")) return (MAG_LEVEL_AVE); + if (!strcasecmp (string, "ref")) return (MAG_LEVEL_REF); + + return MAG_LEVEL_NONE; +} + +dvoMagClassType GetMagClass (char *string) { + + if (!strcasecmp (string, "psf")) return (MAG_CLASS_PSF); + if (!strcasecmp (string, "kron")) return (MAG_CLASS_KRON); + if (!strcasecmp (string, "aper")) return (MAG_CLASS_APER); + if (!strcasecmp (string, "ap")) return (MAG_CLASS_APER); + + return MAG_CLASS_NONE; +} + +dvoMagOptionType GetMagOption (char *string) { + + if (!strcasecmp (string, "mag")) return (MAG_OPTION_MAG); + if (!strcasecmp (string, "flux")) return (MAG_OPTION_FLUX); + if (!strcasecmp (string, "fluxerr")) return (MAG_OPTION_FLUX_ERR); + if (!strcasecmp (string, "err")) return (MAG_OPTION_ERR); + if (!strcasecmp (string, "stdev")) return (MAG_OPTION_STDEV); + if (!strcasecmp (string, "chisq")) return (MAG_OPTION_CHISQ); + if (!strcasecmp (string, "min")) return (MAG_OPTION_MIN); + if (!strcasecmp (string, "max")) return (MAG_OPTION_MAX); + if (!strcasecmp (string, "ncode")) return (MAG_OPTION_NCODE); + if (!strcasecmp (string, "nphot")) return (MAG_OPTION_NPHOT); + if (!strcasecmp (string, "uc_dist")) return (MAG_OPTION_UC_DIST); + if (!strcasecmp (string, "stack_det_id")) return (MAG_OPTION_STACK_DET_ID); + if (!strcasecmp (string, "flags")) return (MAG_OPTION_FLAGS); + + return MAG_OPTION_NONE; +} + +# if (0) int GetMagMode (char *string) { @@ -95,216 +151,89 @@ return (MAG_NONE); } - -PhotCode *ParsePhotcodeField (char *field, int *mode, int defMode) { - - int useDefault; - char *tmpstring, *p; - PhotCode *code; - - *mode = defMode; - useDefault = TRUE; - - p = strchr (field, ':'); - if (p != NULL) { - *mode = GetMagMode (p + 1); - useDefault = FALSE; - if (*mode == MAG_NONE) return (NULL); - tmpstring = strncreate (field, p - field); - } else { - tmpstring = strcreate (field); - } - if (!strcasecmp (tmpstring, "MAG")) { - ALLOCATE (code, PhotCode, 1); - code[0].code = 0; - strcpy (code[0].name, "MAG"); - code[0].type = PHOT_MAG; - // the field call 'mag' is only valid for mextract - // it should default to REL, but other types should default to AVE - if (useDefault) { - *mode = MAG_REL; +# endif + +// field may be of the form mag:psf:inst:wrp. except for the first subword, +// the words may be in any order +int ParsePhotcodeField (dbField *field, char *fieldName) { + + int j; + + // defaults: + field->ID = MEAS_MAG; // change if not true in the end? + field->magSource = MAG_SRC_CHP; + field->magLevel = MAG_LEVEL_AVE; + field->magClass = MAG_CLASS_PSF; + field->magOption = MAG_OPTION_MAG; + + // make a local working copy of fieldName and replace ':' with spaces + char *fieldCopy = strcreate(fieldName); + for (j = 0; fieldCopy[j]; j++) { + if (fieldCopy[j] == ':') fieldCopy[j] = ' '; + } + + char *firstWord = getword(fieldCopy); + + // firstWord may be either mag [mextract] or photcode + if (!strcasecmp (firstWord, "MAG")) { + // default level for 'mag' is rel + field->magLevel = MAG_LEVEL_REL; + } + PhotCode *code = GetPhotcodebyName (firstWord); + free (firstWord); + + if (!code) return FALSE; + + // enforce compatibility + if (code->type == PHOT_REF) { + field->magLevel = MAG_LEVEL_CAT; + } + if (code->type == PHOT_DEP) { + field->magLevel = MAG_LEVEL_REL; + } + + // look at the remaining words and assign properties as approrpiate + char *ptr = skipword(fieldCopy); + while (ptr) { + + char *word = getword(ptr); + if (!word) break; + + dvoMagSourceType source = GetMagSource (word); + if (source != MAG_SRC_NONE) { + field->magSource = source; + ptr = skipword (ptr); + continue; } - free (tmpstring); - return (code); - } - code = GetPhotcodebyName (tmpstring); - if (!code) { - return NULL; - } - - // enforce compatibility - if (useDefault) { - if (code[0].type == PHOT_REF) { - *mode = MAG_CAT; + + dvoMagLevelType level = GetMagLevel (word); + if (level != MAG_LEVEL_NONE) { + field->magLevel = level; + ptr = skipword (ptr); + continue; } - if (code[0].type == PHOT_DEP) { - *mode = MAG_REL; + + dvoMagClassType class = GetMagClass (word); + if (class != MAG_CLASS_NONE) { + field->magClass = class; + ptr = skipword (ptr); + continue; } - } - free (tmpstring); - return (code); -} - -# define ESCAPE(F,M,T) { \ - field->ID = (F); \ - field->magMode = (M); \ - field->type = (T); \ - field->photcode = NULL; \ - return (TRUE); } - -int ParseMeasureField (dbField *field, char *fieldName) { - - int mode; - PhotCode *code; - - field->table = DVO_TABLE_MEASURE; - field->name = strcreate (fieldName); - - if (!strcasecmp (fieldName, "GLON")) { - dbExtractMeasuresInitTransform (COORD_GALACTIC); - ESCAPE (MEAS_GLON, MAG_NONE, OPIHI_FLT); - } - if (!strcasecmp (fieldName, "GLAT")) { - dbExtractMeasuresInitTransform (COORD_GALACTIC); - ESCAPE (MEAS_GLAT, MAG_NONE, OPIHI_FLT); - } - if (!strcasecmp (fieldName, "GLON:AVE")) { - dbExtractMeasuresInitTransform (COORD_GALACTIC); - ESCAPE (MEAS_GLON_AVE, MAG_NONE, OPIHI_FLT); - } - if (!strcasecmp (fieldName, "GLAT:AVE")) { - dbExtractMeasuresInitTransform (COORD_GALACTIC); - ESCAPE (MEAS_GLAT_AVE, MAG_NONE, OPIHI_FLT); - } - - if (!strcasecmp (fieldName, "ELON")) { - dbExtractMeasuresInitTransform (COORD_ECLIPTIC); - ESCAPE (MEAS_ELON, MAG_NONE, OPIHI_FLT); - } - if (!strcasecmp (fieldName, "ELAT")) { - dbExtractMeasuresInitTransform (COORD_ECLIPTIC); - ESCAPE (MEAS_ELAT, MAG_NONE, OPIHI_FLT); - } - if (!strcasecmp (fieldName, "ELON:AVE")) { - dbExtractMeasuresInitTransform (COORD_ECLIPTIC); - ESCAPE (MEAS_ELON_AVE, MAG_NONE, OPIHI_FLT); - } - if (!strcasecmp (fieldName, "ELAT:AVE")) { - dbExtractMeasuresInitTransform (COORD_ECLIPTIC); - ESCAPE (MEAS_ELAT_AVE, MAG_NONE, OPIHI_FLT); - } - - if (!strcasecmp (fieldName, "RA")) ESCAPE (MEAS_RA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "DEC")) ESCAPE (MEAS_DEC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "RA:AVE")) ESCAPE (MEAS_RA_AVE, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "DEC:AVE")) ESCAPE (MEAS_DEC_AVE, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "RA:ERR")) ESCAPE (MEAS_RA_AVE_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "DEC:ERR")) ESCAPE (MEAS_DEC_AVE_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "uRA")) ESCAPE (MEAS_U_RA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "uDEC")) ESCAPE (MEAS_U_DEC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "duRA")) ESCAPE (MEAS_U_RA_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "duDEC")) ESCAPE (MEAS_U_DEC_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PAR")) ESCAPE (MEAS_PAR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dPAR")) ESCAPE (MEAS_PAR_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dR")) ESCAPE (MEAS_RA_OFFSET, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dD")) ESCAPE (MEAS_DEC_OFFSET, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dR:FIT")) ESCAPE (MEAS_RA_FIT_OFFSET, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dD:FIT")) ESCAPE (MEAS_DEC_FIT_OFFSET, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dR:ERR")) ESCAPE (MEAS_RA_OFFSET_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dD:ERR")) ESCAPE (MEAS_DEC_OFFSET_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ChiSqPos")) ESCAPE (MEAS_CHISQ_POS, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ChiSqPM")) ESCAPE (MEAS_CHISQ_PM, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ChiSqPar")) ESCAPE (MEAS_CHISQ_PAR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Tmean")) ESCAPE (MEAS_TMEAN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Trange")) ESCAPE (MEAS_TRANGE, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "nmeas")) ESCAPE (MEAS_NMEAS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "nmiss")) ESCAPE (MEAS_NMISS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "npos")) ESCAPE (MEAS_NPOS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "OBJFLAGS")) ESCAPE (MEAS_OBJ_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "OBJ_FLAGS")) ESCAPE (MEAS_OBJ_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "OBJ_PHOT_FLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "SECFLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "SEC_FLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "SECFILT_FLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "DB_FLAGS")) ESCAPE (MEAS_DB_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "PHOT_FLAGS")) ESCAPE (MEAS_PHOT_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "DBFLAGS")) ESCAPE (MEAS_DB_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "PHOTFLAGS")) ESCAPE (MEAS_PHOT_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "AIRMASS")) ESCAPE (MEAS_AIRMASS, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "MEAN_AIRMASS")) ESCAPE (MEAS_MEAN_AIRMASS, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ALT")) ESCAPE (MEAS_ALT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "AZ")) ESCAPE (MEAS_AZ, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "EXPTIME")) ESCAPE (MEAS_EXPTIME, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PHOTCODE")) ESCAPE (MEAS_PHOTCODE, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "PHOTCODE:KLAM")) ESCAPE (MEAS_PHOTCODE_KLAM, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PHOTCODE:C")) ESCAPE (MEAS_PHOTCODE_C, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PHOTCODE:EQUIV")) ESCAPE (MEAS_PHOTCODE_EQUIV, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "TIME")) ESCAPE (MEAS_TIME, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM")) ESCAPE (MEAS_FWHM, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MAJ")) ESCAPE (MEAS_FWHM_MAJ, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MIN")) ESCAPE (MEAS_FWHM_MIN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "THETA")) ESCAPE (MEAS_THETA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "POSANGLE")) ESCAPE (MEAS_POSANGLE, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PLATESCALE")) ESCAPE (MEAS_PLATESCALE, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "MXX")) ESCAPE (MEAS_MXX, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "MYY")) ESCAPE (MEAS_MYY, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "MXY")) ESCAPE (MEAS_MXY, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "DOPHOT")) ESCAPE (MEAS_DOPHOT, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "XCCD")) ESCAPE (MEAS_XCCD, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "YCCD")) ESCAPE (MEAS_YCCD, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "XCCD:ERR")) ESCAPE (MEAS_XCCD_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "YCCD:ERR")) ESCAPE (MEAS_YCCD_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "XFIX")) ESCAPE (MEAS_XFIX, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "YFIX")) ESCAPE (MEAS_YFIX, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "POS_SYS_ERR")) ESCAPE (MEAS_POS_SYS_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "XFIELD")) ESCAPE (MEAS_XFIELD, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "YFIELD")) ESCAPE (MEAS_YFIELD, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "XMOSAIC")) ESCAPE (MEAS_XMOSAIC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "YMOSAIC")) ESCAPE (MEAS_YMOSAIC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "XCHIP")) ESCAPE (MEAS_XCCD, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "YCHIP")) ESCAPE (MEAS_YCCD, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "XFPA")) ESCAPE (MEAS_XMOSAIC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "YFPA")) ESCAPE (MEAS_YMOSAIC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "DETID")) ESCAPE (MEAS_DET_ID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "OBJID")) ESCAPE (MEAS_OBJ_ID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "CATID")) ESCAPE (MEAS_CAT_ID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "IMAGEID")) ESCAPE (MEAS_IMAGE_ID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "EXTERNID")) ESCAPE (MEAS_EXTERN_ID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "EXPNAME")) ESCAPE (MEAS_EXPNAME_AS_INT, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "PSF_QF")) ESCAPE (MEAS_PSF_QF, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PSF_QF_PERFECT")) ESCAPE (MEAS_PSF_QF_PERFECT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PSF_CHISQ")) ESCAPE (MEAS_PSF_CHISQ, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PSF_NDOF")) ESCAPE (MEAS_PSF_NDOF, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "PSF_NPIX")) ESCAPE (MEAS_PSF_NPIX, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "CR_NSIGMA")) ESCAPE (MEAS_CR_NSIGMA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "EXT_NSIGMA")) ESCAPE (MEAS_EXT_NSIGMA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "SKY")) ESCAPE (MEAS_SKY, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "SKY_ERR")) ESCAPE (MEAS_dSKY, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "MCAL_OFFSET")) ESCAPE (MEAS_MCAL_OFFSET, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FLAT")) ESCAPE (MEAS_FLAT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "CENTER_OFFSET")) ESCAPE (MEAS_CENTER_OFFSET, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FLUX")) ESCAPE (MEAS_FLUX_PSF, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FLUX_ERR")) ESCAPE (MEAS_FLUX_PSF_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FLUX_PSF")) ESCAPE (MEAS_FLUX_PSF, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FLUX_PSF_ERR")) ESCAPE (MEAS_FLUX_PSF_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FLUX_KRON")) ESCAPE (MEAS_FLUX_KRON, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FLUX_KRON_ERR")) ESCAPE (MEAS_FLUX_KRON_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (MEAS_REF_COLOR, MAG_NONE, OPIHI_FLT); - - // for words that don't parse, try a photcode - - // check for code:mode in photcode name - code = ParsePhotcodeField (fieldName, &mode, MAG_AVE); - if (code == NULL) { - gprint (GP_ERR, "unknown field '%s' for measurement table in DVO database\n", fieldName); - return (FALSE); - } - - field->ID = MEAS_MAG; - field->magMode = mode; - switch (mode) { - case MAG_STACK_DET_ID: - case MAG_NCODE: - case MAG_NPHOT: - case MAG_PHOT_FLAGS: + + dvoMagOptionType option = GetMagOption (word); + if (option != MAG_OPTION_NONE) { + field->magOption = option; + ptr = skipword (ptr); + continue; + } + + fprintf (stderr, "ERROR: unknown mag/photocode argument %s\n", word); + free (word); + } + + switch (field->magOption) { + case MAG_OPTION_STACK_DET_ID: + case MAG_OPTION_NCODE: + case MAG_OPTION_NPHOT: + case MAG_OPTION_FLAGS: field->type = OPIHI_INT; break; @@ -314,11 +243,161 @@ } field->photcode = code; + return TRUE; +} + +// field needs to be initialized with dbInitField() +# define ESCAPE(F,T) { \ + field->ID = (F); \ + field->type = (T); \ + return (TRUE); } + +int ParseMeasureField (dbField *field, char *fieldName) { + + field->table = DVO_TABLE_MEASURE; + field->name = strcreate (fieldName); + + if (!strcasecmp (fieldName, "GLON")) { + dbExtractMeasuresInitTransform (COORD_GALACTIC); + ESCAPE (MEAS_GLON, OPIHI_FLT); + } + if (!strcasecmp (fieldName, "GLAT")) { + dbExtractMeasuresInitTransform (COORD_GALACTIC); + ESCAPE (MEAS_GLAT, OPIHI_FLT); + } + if (!strcasecmp (fieldName, "GLON:AVE")) { + dbExtractMeasuresInitTransform (COORD_GALACTIC); + ESCAPE (MEAS_GLON_AVE, OPIHI_FLT); + } + if (!strcasecmp (fieldName, "GLAT:AVE")) { + dbExtractMeasuresInitTransform (COORD_GALACTIC); + ESCAPE (MEAS_GLAT_AVE, OPIHI_FLT); + } + + if (!strcasecmp (fieldName, "ELON")) { + dbExtractMeasuresInitTransform (COORD_ECLIPTIC); + ESCAPE (MEAS_ELON, OPIHI_FLT); + } + if (!strcasecmp (fieldName, "ELAT")) { + dbExtractMeasuresInitTransform (COORD_ECLIPTIC); + ESCAPE (MEAS_ELAT, OPIHI_FLT); + } + if (!strcasecmp (fieldName, "ELON:AVE")) { + dbExtractMeasuresInitTransform (COORD_ECLIPTIC); + ESCAPE (MEAS_ELON_AVE, OPIHI_FLT); + } + if (!strcasecmp (fieldName, "ELAT:AVE")) { + dbExtractMeasuresInitTransform (COORD_ECLIPTIC); + ESCAPE (MEAS_ELAT_AVE, OPIHI_FLT); + } + + if (!strcasecmp (fieldName, "RA")) ESCAPE (MEAS_RA, OPIHI_FLT); + if (!strcasecmp (fieldName, "DEC")) ESCAPE (MEAS_DEC, OPIHI_FLT); + if (!strcasecmp (fieldName, "RA:AVE")) ESCAPE (MEAS_RA_AVE, OPIHI_FLT); + if (!strcasecmp (fieldName, "DEC:AVE")) ESCAPE (MEAS_DEC_AVE, OPIHI_FLT); + if (!strcasecmp (fieldName, "RA:ERR")) ESCAPE (MEAS_RA_AVE_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "DEC:ERR")) ESCAPE (MEAS_DEC_AVE_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "uRA")) ESCAPE (MEAS_U_RA, OPIHI_FLT); + if (!strcasecmp (fieldName, "uDEC")) ESCAPE (MEAS_U_DEC, OPIHI_FLT); + if (!strcasecmp (fieldName, "duRA")) ESCAPE (MEAS_U_RA_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "duDEC")) ESCAPE (MEAS_U_DEC_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "PAR")) ESCAPE (MEAS_PAR, OPIHI_FLT); + if (!strcasecmp (fieldName, "dPAR")) ESCAPE (MEAS_PAR_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "dR")) ESCAPE (MEAS_RA_OFFSET, OPIHI_FLT); + if (!strcasecmp (fieldName, "dD")) ESCAPE (MEAS_DEC_OFFSET, OPIHI_FLT); + if (!strcasecmp (fieldName, "dR:FIT")) ESCAPE (MEAS_RA_FIT_OFFSET, OPIHI_FLT); + if (!strcasecmp (fieldName, "dD:FIT")) ESCAPE (MEAS_DEC_FIT_OFFSET, OPIHI_FLT); + if (!strcasecmp (fieldName, "dR:ERR")) ESCAPE (MEAS_RA_OFFSET_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "dD:ERR")) ESCAPE (MEAS_DEC_OFFSET_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "ChiSqPos")) ESCAPE (MEAS_CHISQ_POS, OPIHI_FLT); + if (!strcasecmp (fieldName, "ChiSqPM")) ESCAPE (MEAS_CHISQ_PM, OPIHI_FLT); + if (!strcasecmp (fieldName, "ChiSqPar")) ESCAPE (MEAS_CHISQ_PAR, OPIHI_FLT); + if (!strcasecmp (fieldName, "Tmean")) ESCAPE (MEAS_TMEAN, OPIHI_FLT); + if (!strcasecmp (fieldName, "Trange")) ESCAPE (MEAS_TRANGE, OPIHI_FLT); + if (!strcasecmp (fieldName, "nmeas")) ESCAPE (MEAS_NMEAS, OPIHI_INT); + if (!strcasecmp (fieldName, "nmiss")) ESCAPE (MEAS_NMISS, OPIHI_INT); + if (!strcasecmp (fieldName, "npos")) ESCAPE (MEAS_NPOS, OPIHI_INT); + if (!strcasecmp (fieldName, "OBJFLAGS")) ESCAPE (MEAS_OBJ_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "OBJ_FLAGS")) ESCAPE (MEAS_OBJ_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "OBJ_PHOT_FLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "SECFLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "SEC_FLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "SECFILT_FLAGS")) ESCAPE (MEAS_SECFILT_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "DB_FLAGS")) ESCAPE (MEAS_DB_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "PHOT_FLAGS")) ESCAPE (MEAS_PHOT_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "DBFLAGS")) ESCAPE (MEAS_DB_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "PHOTFLAGS")) ESCAPE (MEAS_PHOT_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "AIRMASS")) ESCAPE (MEAS_AIRMASS, OPIHI_FLT); + if (!strcasecmp (fieldName, "MEAN_AIRMASS")) ESCAPE (MEAS_MEAN_AIRMASS, OPIHI_FLT); + if (!strcasecmp (fieldName, "ALT")) ESCAPE (MEAS_ALT, OPIHI_FLT); + if (!strcasecmp (fieldName, "AZ")) ESCAPE (MEAS_AZ, OPIHI_FLT); + if (!strcasecmp (fieldName, "EXPTIME")) ESCAPE (MEAS_EXPTIME, OPIHI_FLT); + if (!strcasecmp (fieldName, "PHOTCODE")) ESCAPE (MEAS_PHOTCODE, OPIHI_INT); + if (!strcasecmp (fieldName, "PHOTCODE:KLAM")) ESCAPE (MEAS_PHOTCODE_KLAM, OPIHI_FLT); + if (!strcasecmp (fieldName, "PHOTCODE:C")) ESCAPE (MEAS_PHOTCODE_C, OPIHI_FLT); + if (!strcasecmp (fieldName, "PHOTCODE:EQUIV")) ESCAPE (MEAS_PHOTCODE_EQUIV, OPIHI_INT); + if (!strcasecmp (fieldName, "TIME")) ESCAPE (MEAS_TIME, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM")) ESCAPE (MEAS_FWHM, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MAJ")) ESCAPE (MEAS_FWHM_MAJ, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MIN")) ESCAPE (MEAS_FWHM_MIN, OPIHI_FLT); + if (!strcasecmp (fieldName, "THETA")) ESCAPE (MEAS_THETA, OPIHI_FLT); + if (!strcasecmp (fieldName, "POSANGLE")) ESCAPE (MEAS_POSANGLE, OPIHI_FLT); + if (!strcasecmp (fieldName, "PLATESCALE")) ESCAPE (MEAS_PLATESCALE, OPIHI_FLT); + if (!strcasecmp (fieldName, "MXX")) ESCAPE (MEAS_MXX, OPIHI_FLT); + if (!strcasecmp (fieldName, "MYY")) ESCAPE (MEAS_MYY, OPIHI_FLT); + if (!strcasecmp (fieldName, "MXY")) ESCAPE (MEAS_MXY, OPIHI_FLT); + if (!strcasecmp (fieldName, "DOPHOT")) ESCAPE (MEAS_DOPHOT, OPIHI_INT); + if (!strcasecmp (fieldName, "XCCD")) ESCAPE (MEAS_XCCD, OPIHI_FLT); + if (!strcasecmp (fieldName, "YCCD")) ESCAPE (MEAS_YCCD, OPIHI_FLT); + if (!strcasecmp (fieldName, "XCCD:ERR")) ESCAPE (MEAS_XCCD_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "YCCD:ERR")) ESCAPE (MEAS_YCCD_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "XFIX")) ESCAPE (MEAS_XFIX, OPIHI_FLT); + if (!strcasecmp (fieldName, "YFIX")) ESCAPE (MEAS_YFIX, OPIHI_FLT); + if (!strcasecmp (fieldName, "POS_SYS_ERR")) ESCAPE (MEAS_POS_SYS_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "XFIELD")) ESCAPE (MEAS_XFIELD, OPIHI_FLT); + if (!strcasecmp (fieldName, "YFIELD")) ESCAPE (MEAS_YFIELD, OPIHI_FLT); + if (!strcasecmp (fieldName, "XMOSAIC")) ESCAPE (MEAS_XMOSAIC, OPIHI_FLT); + if (!strcasecmp (fieldName, "YMOSAIC")) ESCAPE (MEAS_YMOSAIC, OPIHI_FLT); + if (!strcasecmp (fieldName, "XCHIP")) ESCAPE (MEAS_XCCD, OPIHI_FLT); + if (!strcasecmp (fieldName, "YCHIP")) ESCAPE (MEAS_YCCD, OPIHI_FLT); + if (!strcasecmp (fieldName, "XFPA")) ESCAPE (MEAS_XMOSAIC, OPIHI_FLT); + if (!strcasecmp (fieldName, "YFPA")) ESCAPE (MEAS_YMOSAIC, OPIHI_FLT); + if (!strcasecmp (fieldName, "DETID")) ESCAPE (MEAS_DET_ID, OPIHI_INT); + if (!strcasecmp (fieldName, "OBJID")) ESCAPE (MEAS_OBJ_ID, OPIHI_INT); + if (!strcasecmp (fieldName, "CATID")) ESCAPE (MEAS_CAT_ID, OPIHI_INT); + if (!strcasecmp (fieldName, "IMAGEID")) ESCAPE (MEAS_IMAGE_ID, OPIHI_INT); + if (!strcasecmp (fieldName, "EXTERNID")) ESCAPE (MEAS_EXTERN_ID, OPIHI_INT); + if (!strcasecmp (fieldName, "EXPNAME")) ESCAPE (MEAS_EXPNAME_AS_INT, OPIHI_INT); + if (!strcasecmp (fieldName, "PSF_QF")) ESCAPE (MEAS_PSF_QF, OPIHI_FLT); + if (!strcasecmp (fieldName, "PSF_QF_PERFECT")) ESCAPE (MEAS_PSF_QF_PERFECT, OPIHI_FLT); + if (!strcasecmp (fieldName, "PSF_CHISQ")) ESCAPE (MEAS_PSF_CHISQ, OPIHI_FLT); + if (!strcasecmp (fieldName, "PSF_NDOF")) ESCAPE (MEAS_PSF_NDOF, OPIHI_INT); + if (!strcasecmp (fieldName, "PSF_NPIX")) ESCAPE (MEAS_PSF_NPIX, OPIHI_INT); + if (!strcasecmp (fieldName, "CR_NSIGMA")) ESCAPE (MEAS_CR_NSIGMA, OPIHI_FLT); + if (!strcasecmp (fieldName, "EXT_NSIGMA")) ESCAPE (MEAS_EXT_NSIGMA, OPIHI_FLT); + if (!strcasecmp (fieldName, "SKY")) ESCAPE (MEAS_SKY, OPIHI_FLT); + if (!strcasecmp (fieldName, "SKY_ERR")) ESCAPE (MEAS_dSKY, OPIHI_FLT); + if (!strcasecmp (fieldName, "MCAL_OFFSET")) ESCAPE (MEAS_MCAL_OFFSET, OPIHI_FLT); + if (!strcasecmp (fieldName, "FLAT")) ESCAPE (MEAS_FLAT, OPIHI_FLT); + if (!strcasecmp (fieldName, "CENTER_OFFSET")) ESCAPE (MEAS_CENTER_OFFSET, OPIHI_FLT); + // if (!strcasecmp (fieldName, "FLUX")) ESCAPE (MEAS_FLUX_PSF, OPIHI_FLT); + // if (!strcasecmp (fieldName, "FLUX_ERR")) ESCAPE (MEAS_FLUX_PSF_ERR, OPIHI_FLT); + // if (!strcasecmp (fieldName, "FLUX_PSF")) ESCAPE (MEAS_FLUX_PSF, OPIHI_FLT); + // if (!strcasecmp (fieldName, "FLUX_PSF_ERR")) ESCAPE (MEAS_FLUX_PSF_ERR, OPIHI_FLT); + // if (!strcasecmp (fieldName, "FLUX_KRON")) ESCAPE (MEAS_FLUX_KRON, OPIHI_FLT); + // if (!strcasecmp (fieldName, "FLUX_KRON_ERR")) ESCAPE (MEAS_FLUX_KRON_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (MEAS_REF_COLOR, OPIHI_FLT); + + // for words that don't parse, try a photcode + + // check for code:mode in photcode name + if (!ParsePhotcodeField (field, fieldName)) { + gprint (GP_ERR, "unknown field '%s' for measurement table in DVO database\n", fieldName); + return (FALSE); + } + return (TRUE); } int ParseAverageField (dbField *field, char *fieldName) { - - int mode; - PhotCode *code; field->table = DVO_TABLE_AVERAGE; @@ -329,9 +408,9 @@ if (!strcasecmp (fieldName, "GLON")) { dbExtractAveragesInitTransform (COORD_GALACTIC); - ESCAPE (AVE_GLON, MAG_NONE, OPIHI_FLT); + ESCAPE (AVE_GLON, OPIHI_FLT); } if (!strcasecmp (fieldName, "GLAT")) { dbExtractAveragesInitTransform (COORD_GALACTIC); - ESCAPE (AVE_GLAT, MAG_NONE, OPIHI_FLT); + ESCAPE (AVE_GLAT, OPIHI_FLT); } @@ -340,75 +419,59 @@ if (!strcasecmp (fieldName, "ELON")) { dbExtractAveragesInitTransform (COORD_ECLIPTIC); - ESCAPE (AVE_ELON, MAG_NONE, OPIHI_FLT); + ESCAPE (AVE_ELON, OPIHI_FLT); } if (!strcasecmp (fieldName, "ELAT")) { dbExtractAveragesInitTransform (COORD_ECLIPTIC); - ESCAPE (AVE_ELAT, MAG_NONE, OPIHI_FLT); - } - - if (!strcasecmp (fieldName, "RA")) ESCAPE (AVE_RA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "DEC")) ESCAPE (AVE_DEC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "GLON")) ESCAPE (AVE_GLON, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "GLAT")) ESCAPE (AVE_GLAT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ELON")) ESCAPE (AVE_ELON, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ELAT")) ESCAPE (AVE_ELAT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dRA")) ESCAPE (AVE_RA_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dDEC")) ESCAPE (AVE_DEC_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "uRA")) ESCAPE (AVE_U_RA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "uDEC")) ESCAPE (AVE_U_DEC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "duRA")) ESCAPE (AVE_U_RA_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "duDEC")) ESCAPE (AVE_U_DEC_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "PAR")) ESCAPE (AVE_PAR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dPAR")) ESCAPE (AVE_PAR_ERR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ChiSqPos")) ESCAPE (AVE_CHISQ_POS, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ChiSqPM")) ESCAPE (AVE_CHISQ_PM, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ChiSqPar")) ESCAPE (AVE_CHISQ_PAR, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Tmean")) ESCAPE (AVE_TMEAN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Trange")) ESCAPE (AVE_TRANGE, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "psfqf")) ESCAPE (AVE_PSF_QF, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "psfqfperf")) ESCAPE (AVE_PSF_QF_PERF, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "psf_qf")) ESCAPE (AVE_PSF_QF, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "psf_qf_perf")) ESCAPE (AVE_PSF_QF_PERF, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "stargal")) ESCAPE (AVE_STARGAL, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "NMEAS")) ESCAPE (AVE_NMEAS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NMISS")) ESCAPE (AVE_NMISS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NPOS")) ESCAPE (AVE_NPOS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NASTROM")) ESCAPE (AVE_NPOS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "FLAGS")) ESCAPE (AVE_OBJ_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "OBJ_FLAGS")) ESCAPE (AVE_OBJ_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "OBJFLAGS")) ESCAPE (AVE_OBJ_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "OBJID")) ESCAPE (AVE_OBJID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "CATID")) ESCAPE (AVE_CATID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "EXTID_HI")) ESCAPE (AVE_EXTID_HI, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "EXTID_LO")) ESCAPE (AVE_EXTID_LO, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (AVE_REF_COLOR, MAG_NONE, OPIHI_FLT); + ESCAPE (AVE_ELAT, OPIHI_FLT); + } + + if (!strcasecmp (fieldName, "RA")) ESCAPE (AVE_RA, OPIHI_FLT); + if (!strcasecmp (fieldName, "DEC")) ESCAPE (AVE_DEC, OPIHI_FLT); + if (!strcasecmp (fieldName, "GLON")) ESCAPE (AVE_GLON, OPIHI_FLT); + if (!strcasecmp (fieldName, "GLAT")) ESCAPE (AVE_GLAT, OPIHI_FLT); + if (!strcasecmp (fieldName, "ELON")) ESCAPE (AVE_ELON, OPIHI_FLT); + if (!strcasecmp (fieldName, "ELAT")) ESCAPE (AVE_ELAT, OPIHI_FLT); + if (!strcasecmp (fieldName, "dRA")) ESCAPE (AVE_RA_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "dDEC")) ESCAPE (AVE_DEC_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "uRA")) ESCAPE (AVE_U_RA, OPIHI_FLT); + if (!strcasecmp (fieldName, "uDEC")) ESCAPE (AVE_U_DEC, OPIHI_FLT); + if (!strcasecmp (fieldName, "duRA")) ESCAPE (AVE_U_RA_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "duDEC")) ESCAPE (AVE_U_DEC_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "PAR")) ESCAPE (AVE_PAR, OPIHI_FLT); + if (!strcasecmp (fieldName, "dPAR")) ESCAPE (AVE_PAR_ERR, OPIHI_FLT); + if (!strcasecmp (fieldName, "ChiSqPos")) ESCAPE (AVE_CHISQ_POS, OPIHI_FLT); + if (!strcasecmp (fieldName, "ChiSqPM")) ESCAPE (AVE_CHISQ_PM, OPIHI_FLT); + if (!strcasecmp (fieldName, "ChiSqPar")) ESCAPE (AVE_CHISQ_PAR, OPIHI_FLT); + if (!strcasecmp (fieldName, "Tmean")) ESCAPE (AVE_TMEAN, OPIHI_FLT); + if (!strcasecmp (fieldName, "Trange")) ESCAPE (AVE_TRANGE, OPIHI_FLT); + if (!strcasecmp (fieldName, "psfqf")) ESCAPE (AVE_PSF_QF, OPIHI_FLT); + if (!strcasecmp (fieldName, "psfqfperf")) ESCAPE (AVE_PSF_QF_PERF, OPIHI_FLT); + if (!strcasecmp (fieldName, "psf_qf")) ESCAPE (AVE_PSF_QF, OPIHI_FLT); + if (!strcasecmp (fieldName, "psf_qf_perf")) ESCAPE (AVE_PSF_QF_PERF, OPIHI_FLT); + if (!strcasecmp (fieldName, "stargal")) ESCAPE (AVE_STARGAL, OPIHI_FLT); + if (!strcasecmp (fieldName, "NMEAS")) ESCAPE (AVE_NMEAS, OPIHI_INT); + if (!strcasecmp (fieldName, "NMISS")) ESCAPE (AVE_NMISS, OPIHI_INT); + if (!strcasecmp (fieldName, "NPOS")) ESCAPE (AVE_NPOS, OPIHI_INT); + if (!strcasecmp (fieldName, "NASTROM")) ESCAPE (AVE_NPOS, OPIHI_INT); + if (!strcasecmp (fieldName, "FLAGS")) ESCAPE (AVE_OBJ_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "OBJ_FLAGS")) ESCAPE (AVE_OBJ_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "OBJFLAGS")) ESCAPE (AVE_OBJ_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "OBJID")) ESCAPE (AVE_OBJID, OPIHI_INT); + if (!strcasecmp (fieldName, "CATID")) ESCAPE (AVE_CATID, OPIHI_INT); + if (!strcasecmp (fieldName, "EXTID_HI")) ESCAPE (AVE_EXTID_HI, OPIHI_INT); + if (!strcasecmp (fieldName, "EXTID_LO")) ESCAPE (AVE_EXTID_LO, OPIHI_INT); + if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (AVE_REF_COLOR, OPIHI_FLT); // check for code:mode in photcode name - code = ParsePhotcodeField (fieldName, &mode, MAG_AVE); - if (code == NULL) { + if (!ParsePhotcodeField (field, fieldName)) { gprint (GP_ERR, "unknown field '%s' for average table in DVO database\n", fieldName); return (FALSE); } - if (code[0].type == PHOT_MAG) { + if (field->photcode->type == PHOT_MAG) { gprint (GP_ERR, "'mag' is ambiguous for avextract\n"); - free (code); return (FALSE); } - field->ID = AVE_MAG; - field->magMode = mode; - switch (mode) { - case MAG_STACK_DET_ID: - case MAG_NCODE: - case MAG_NPHOT: - case MAG_PHOT_FLAGS: - field->type = OPIHI_INT; - break; - default: - field->type = OPIHI_FLT; - break; - } - field->photcode = code; return (TRUE); } @@ -424,9 +487,9 @@ if (!strcasecmp (fieldName, "GLON")) { dbExtractImagesInitTransform (COORD_GALACTIC); - ESCAPE (IMAGE_GLON, MAG_NONE, OPIHI_FLT); + ESCAPE (IMAGE_GLON, OPIHI_FLT); } if (!strcasecmp (fieldName, "GLAT")) { dbExtractImagesInitTransform (COORD_GALACTIC); - ESCAPE (IMAGE_GLAT, MAG_NONE, OPIHI_FLT); + ESCAPE (IMAGE_GLAT, OPIHI_FLT); } @@ -435,98 +498,98 @@ if (!strcasecmp (fieldName, "ELON")) { dbExtractImagesInitTransform (COORD_ECLIPTIC); - ESCAPE (IMAGE_ELON, MAG_NONE, OPIHI_FLT); + ESCAPE (IMAGE_ELON, OPIHI_FLT); } if (!strcasecmp (fieldName, "ELAT")) { dbExtractImagesInitTransform (COORD_ECLIPTIC); - ESCAPE (IMAGE_ELAT, MAG_NONE, OPIHI_FLT); - } - - if (!strcasecmp (fieldName, "RA" )) ESCAPE (IMAGE_RA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "DEC" )) ESCAPE (IMAGE_DEC, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "GLON" )) ESCAPE (IMAGE_GLON, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "GLAT" )) ESCAPE (IMAGE_GLAT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ELON" )) ESCAPE (IMAGE_ELON, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "ELAT" )) ESCAPE (IMAGE_ELAT, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "theta" )) ESCAPE (IMAGE_THETA, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "skew" )) ESCAPE (IMAGE_SKEW, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "scale" )) ESCAPE (IMAGE_SCALE, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dscale" )) ESCAPE (IMAGE_DSCALE, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "time" )) ESCAPE (IMAGE_TIME, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "nstar" )) ESCAPE (IMAGE_NSTAR, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "airmass" )) ESCAPE (IMAGE_AIRMASS, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "NX" )) ESCAPE (IMAGE_NX_PIX, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NY" )) ESCAPE (IMAGE_NY_PIX, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "apresid" )) ESCAPE (IMAGE_APRESID, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dapresid" )) ESCAPE (IMAGE_DAPRESID, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "Mcal" )) ESCAPE (IMAGE_MCAL, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dMcal" )) ESCAPE (IMAGE_dMCAL, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Xm" )) ESCAPE (IMAGE_XM, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "photcode" )) ESCAPE (IMAGE_PHOTCODE, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "exptime" )) ESCAPE (IMAGE_EXPTIME, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "sidtime" )) ESCAPE (IMAGE_SIDTIME, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "latitude" )) ESCAPE (IMAGE_LATITUDE, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "detlimit" )) ESCAPE (IMAGE_DET_LIMIT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "satlimit" )) ESCAPE (IMAGE_SAT_LIMIT, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "cerror" )) ESCAPE (IMAGE_CERROR, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "FWHM" )) ESCAPE (IMAGE_FWHM, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MAJ" )) ESCAPE (IMAGE_FWHM_MAJ, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MIN" )) ESCAPE (IMAGE_FWHM_MIN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MAJOR" )) ESCAPE (IMAGE_FWHM_MAJ, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MINOR" )) ESCAPE (IMAGE_FWHM_MIN, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "FWHM_MEDIAN" )) ESCAPE (IMAGE_FWHM_MEDIAN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MAJ_MEDIAN")) ESCAPE (IMAGE_FWHM_MAJ_MEDIAN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MIN_MEDIAN")) ESCAPE (IMAGE_FWHM_MIN_MEDIAN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MAJOR_MEDIAN")) ESCAPE (IMAGE_FWHM_MAJ_MEDIAN, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "FWHM_MINOR_MEDIAN")) ESCAPE (IMAGE_FWHM_MIN_MEDIAN, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "trate" )) ESCAPE (IMAGE_TRATE, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "ncal" )) ESCAPE (IMAGE_NCAL, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "sky" )) ESCAPE (IMAGE_SKY, MAG_NONE, OPIHI_FLT); // deprecated for now - - if (!strcasecmp (fieldName, "imflags" )) ESCAPE (IMAGE_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "flags" )) ESCAPE (IMAGE_FLAGS, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "ccdnum" )) ESCAPE (IMAGE_CCDNUM, MAG_NONE, OPIHI_INT); - - if (!strcasecmp (fieldName, "imageID" )) ESCAPE (IMAGE_IMAGE_ID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "externID" )) ESCAPE (IMAGE_EXTERN_ID, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "sourceID" )) ESCAPE (IMAGE_SOURCE_ID, MAG_NONE, OPIHI_INT); - - if (!strcasecmp (fieldName, "X_LL_CHIP")) ESCAPE (IMAGE_X_LL_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "X_LR_CHIP")) ESCAPE (IMAGE_X_LR_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "X_UL_CHIP")) ESCAPE (IMAGE_X_UL_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "X_UR_CHIP")) ESCAPE (IMAGE_X_UR_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_LL_CHIP")) ESCAPE (IMAGE_Y_LL_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_LR_CHIP")) ESCAPE (IMAGE_Y_LR_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_UL_CHIP")) ESCAPE (IMAGE_Y_UL_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_UR_CHIP")) ESCAPE (IMAGE_Y_UR_CHIP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "X_LL_FP" )) ESCAPE (IMAGE_X_LL_FP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "X_LR_FP" )) ESCAPE (IMAGE_X_LR_FP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "X_UL_FP" )) ESCAPE (IMAGE_X_UL_FP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "X_UR_FP" )) ESCAPE (IMAGE_X_UR_FP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_LL_FP" )) ESCAPE (IMAGE_Y_LL_FP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_LR_FP" )) ESCAPE (IMAGE_Y_LR_FP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_UL_FP" )) ESCAPE (IMAGE_Y_UL_FP, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "Y_UR_FP" )) ESCAPE (IMAGE_Y_UR_FP, MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "dX_SYS" )) ESCAPE (IMAGE_X_ERR_SYS, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dY_SYS" )) ESCAPE (IMAGE_Y_ERR_SYS, MAG_NONE, OPIHI_FLT); - if (!strcasecmp (fieldName, "dM_SYS" )) ESCAPE (IMAGE_MAG_ERR_SYS,MAG_NONE, OPIHI_FLT); - - if (!strcasecmp (fieldName, "UBERCAL_DIST")) ESCAPE (IMAGE_UBERCAL_DIST,MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "UCDIST")) ESCAPE (IMAGE_UBERCAL_DIST,MAG_NONE, OPIHI_INT); - - if (!strcasecmp (fieldName, "NFIT_PHOTOM")) ESCAPE (IMAGE_NFIT_PHOTOM, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NFIT_ASTROM")) ESCAPE (IMAGE_NFIT_ASTROM, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NLINK_PHOTOM")) ESCAPE (IMAGE_NLINK_PHOTOM, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "NLINK_ASTROM")) ESCAPE (IMAGE_NLINK_ASTROM, MAG_NONE, OPIHI_INT); - if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (IMAGE_REF_COLOR, MAG_NONE, OPIHI_FLT); + ESCAPE (IMAGE_ELAT, OPIHI_FLT); + } + + if (!strcasecmp (fieldName, "RA" )) ESCAPE (IMAGE_RA, OPIHI_FLT); + if (!strcasecmp (fieldName, "DEC" )) ESCAPE (IMAGE_DEC, OPIHI_FLT); + if (!strcasecmp (fieldName, "GLON" )) ESCAPE (IMAGE_GLON, OPIHI_FLT); + if (!strcasecmp (fieldName, "GLAT" )) ESCAPE (IMAGE_GLAT, OPIHI_FLT); + if (!strcasecmp (fieldName, "ELON" )) ESCAPE (IMAGE_ELON, OPIHI_FLT); + if (!strcasecmp (fieldName, "ELAT" )) ESCAPE (IMAGE_ELAT, OPIHI_FLT); + + if (!strcasecmp (fieldName, "theta" )) ESCAPE (IMAGE_THETA, OPIHI_FLT); + if (!strcasecmp (fieldName, "skew" )) ESCAPE (IMAGE_SKEW, OPIHI_FLT); + if (!strcasecmp (fieldName, "scale" )) ESCAPE (IMAGE_SCALE, OPIHI_FLT); + if (!strcasecmp (fieldName, "dscale" )) ESCAPE (IMAGE_DSCALE, OPIHI_FLT); + + if (!strcasecmp (fieldName, "time" )) ESCAPE (IMAGE_TIME, OPIHI_FLT); + if (!strcasecmp (fieldName, "nstar" )) ESCAPE (IMAGE_NSTAR, OPIHI_INT); + if (!strcasecmp (fieldName, "airmass" )) ESCAPE (IMAGE_AIRMASS, OPIHI_FLT); + if (!strcasecmp (fieldName, "NX" )) ESCAPE (IMAGE_NX_PIX, OPIHI_INT); + if (!strcasecmp (fieldName, "NY" )) ESCAPE (IMAGE_NY_PIX, OPIHI_INT); + if (!strcasecmp (fieldName, "apresid" )) ESCAPE (IMAGE_APRESID, OPIHI_FLT); + if (!strcasecmp (fieldName, "dapresid" )) ESCAPE (IMAGE_DAPRESID, OPIHI_FLT); + + if (!strcasecmp (fieldName, "Mcal" )) ESCAPE (IMAGE_MCAL, OPIHI_FLT); + if (!strcasecmp (fieldName, "dMcal" )) ESCAPE (IMAGE_dMCAL, OPIHI_FLT); + if (!strcasecmp (fieldName, "Xm" )) ESCAPE (IMAGE_XM, OPIHI_FLT); + if (!strcasecmp (fieldName, "photcode" )) ESCAPE (IMAGE_PHOTCODE, OPIHI_INT); + if (!strcasecmp (fieldName, "exptime" )) ESCAPE (IMAGE_EXPTIME, OPIHI_FLT); + if (!strcasecmp (fieldName, "sidtime" )) ESCAPE (IMAGE_SIDTIME, OPIHI_FLT); + + if (!strcasecmp (fieldName, "latitude" )) ESCAPE (IMAGE_LATITUDE, OPIHI_FLT); + + if (!strcasecmp (fieldName, "detlimit" )) ESCAPE (IMAGE_DET_LIMIT, OPIHI_FLT); + if (!strcasecmp (fieldName, "satlimit" )) ESCAPE (IMAGE_SAT_LIMIT, OPIHI_FLT); + if (!strcasecmp (fieldName, "cerror" )) ESCAPE (IMAGE_CERROR, OPIHI_FLT); + + if (!strcasecmp (fieldName, "FWHM" )) ESCAPE (IMAGE_FWHM, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MAJ" )) ESCAPE (IMAGE_FWHM_MAJ, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MIN" )) ESCAPE (IMAGE_FWHM_MIN, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MAJOR" )) ESCAPE (IMAGE_FWHM_MAJ, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MINOR" )) ESCAPE (IMAGE_FWHM_MIN, OPIHI_FLT); + + if (!strcasecmp (fieldName, "FWHM_MEDIAN" )) ESCAPE (IMAGE_FWHM_MEDIAN, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MAJ_MEDIAN")) ESCAPE (IMAGE_FWHM_MAJ_MEDIAN, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MIN_MEDIAN")) ESCAPE (IMAGE_FWHM_MIN_MEDIAN, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MAJOR_MEDIAN")) ESCAPE (IMAGE_FWHM_MAJ_MEDIAN, OPIHI_FLT); + if (!strcasecmp (fieldName, "FWHM_MINOR_MEDIAN")) ESCAPE (IMAGE_FWHM_MIN_MEDIAN, OPIHI_FLT); + + if (!strcasecmp (fieldName, "trate" )) ESCAPE (IMAGE_TRATE, OPIHI_FLT); + + if (!strcasecmp (fieldName, "ncal" )) ESCAPE (IMAGE_NCAL, OPIHI_INT); + if (!strcasecmp (fieldName, "sky" )) ESCAPE (IMAGE_SKY, OPIHI_FLT); // deprecated for now + + if (!strcasecmp (fieldName, "imflags" )) ESCAPE (IMAGE_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "flags" )) ESCAPE (IMAGE_FLAGS, OPIHI_INT); + if (!strcasecmp (fieldName, "ccdnum" )) ESCAPE (IMAGE_CCDNUM, OPIHI_INT); + + if (!strcasecmp (fieldName, "imageID" )) ESCAPE (IMAGE_IMAGE_ID, OPIHI_INT); + if (!strcasecmp (fieldName, "externID" )) ESCAPE (IMAGE_EXTERN_ID, OPIHI_INT); + if (!strcasecmp (fieldName, "sourceID" )) ESCAPE (IMAGE_SOURCE_ID, OPIHI_INT); + + if (!strcasecmp (fieldName, "X_LL_CHIP")) ESCAPE (IMAGE_X_LL_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "X_LR_CHIP")) ESCAPE (IMAGE_X_LR_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "X_UL_CHIP")) ESCAPE (IMAGE_X_UL_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "X_UR_CHIP")) ESCAPE (IMAGE_X_UR_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_LL_CHIP")) ESCAPE (IMAGE_Y_LL_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_LR_CHIP")) ESCAPE (IMAGE_Y_LR_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_UL_CHIP")) ESCAPE (IMAGE_Y_UL_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_UR_CHIP")) ESCAPE (IMAGE_Y_UR_CHIP, OPIHI_FLT); + if (!strcasecmp (fieldName, "X_LL_FP" )) ESCAPE (IMAGE_X_LL_FP, OPIHI_FLT); + if (!strcasecmp (fieldName, "X_LR_FP" )) ESCAPE (IMAGE_X_LR_FP, OPIHI_FLT); + if (!strcasecmp (fieldName, "X_UL_FP" )) ESCAPE (IMAGE_X_UL_FP, OPIHI_FLT); + if (!strcasecmp (fieldName, "X_UR_FP" )) ESCAPE (IMAGE_X_UR_FP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_LL_FP" )) ESCAPE (IMAGE_Y_LL_FP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_LR_FP" )) ESCAPE (IMAGE_Y_LR_FP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_UL_FP" )) ESCAPE (IMAGE_Y_UL_FP, OPIHI_FLT); + if (!strcasecmp (fieldName, "Y_UR_FP" )) ESCAPE (IMAGE_Y_UR_FP, OPIHI_FLT); + + if (!strcasecmp (fieldName, "dX_SYS" )) ESCAPE (IMAGE_X_ERR_SYS, OPIHI_FLT); + if (!strcasecmp (fieldName, "dY_SYS" )) ESCAPE (IMAGE_Y_ERR_SYS, OPIHI_FLT); + if (!strcasecmp (fieldName, "dM_SYS" )) ESCAPE (IMAGE_MAG_ERR_SYS,OPIHI_FLT); + + if (!strcasecmp (fieldName, "UBERCAL_DIST")) ESCAPE (IMAGE_UBERCAL_DIST,OPIHI_INT); + if (!strcasecmp (fieldName, "UCDIST")) ESCAPE (IMAGE_UBERCAL_DIST,OPIHI_INT); + + if (!strcasecmp (fieldName, "NFIT_PHOTOM")) ESCAPE (IMAGE_NFIT_PHOTOM, OPIHI_INT); + if (!strcasecmp (fieldName, "NFIT_ASTROM")) ESCAPE (IMAGE_NFIT_ASTROM, OPIHI_INT); + if (!strcasecmp (fieldName, "NLINK_PHOTOM")) ESCAPE (IMAGE_NLINK_PHOTOM, OPIHI_INT); + if (!strcasecmp (fieldName, "NLINK_ASTROM")) ESCAPE (IMAGE_NLINK_ASTROM, OPIHI_INT); + if (!strcasecmp (fieldName, "REF_COLOR")) ESCAPE (IMAGE_REF_COLOR, OPIHI_FLT); // for words that don't parse, try a photcode Index: /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_photcode_ops.c =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_photcode_ops.c (revision 36907) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_photcode_ops.c (revision 36908) @@ -18,4 +18,5 @@ static PhotCodeData *photcodes = NULL; +static PhotCode *genericCode = NULL; PhotCodeData *GetPhotcodeTable () { @@ -26,4 +27,10 @@ photcodes[0].code = NULL; } + if (genericCode == NULL) { + ALLOCATE (genericCode, PhotCode, 1); + genericCode->code = 0; + strcpy (genericCode->name, "MAG"); + genericCode->type = PHOT_MAG; + } return photcodes; } @@ -57,4 +64,9 @@ if (name == NULL) return (NULL); + // "MAG" is a special word, not allowed for a photcode name + if (!strcasecmp (name, "MAG")) { + return genericCode; + } + for (i = 0; i < photcodes[0].Ncode; i++) { if (!strcmp (photcodes[0].code[i].name, name)) { @@ -70,4 +82,9 @@ if (name == NULL) return (0); + + // "MAG" is a special word, not allowed for a photcode name + if (!strcasecmp (name, "MAG")) { + return genericCode->code; + } for (i = 0; i < photcodes[0].Ncode; i++) { @@ -222,546 +239,356 @@ /******** photometry conversion functions *********/ -float PhotInst (Measure *measure) { - - int Np; - float M; - - Np = photcodes[0].hashcode[measure[0].photcode]; +float PhotInst (Measure *measure, dvoMagClassType class) { + + int Np = photcodes[0].hashcode[measure[0].photcode]; if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - M = measure[0].M; - return (M); - } - - M = measure[0].M - measure[0].dt - ZERO_POINT; - - return (M); - -} - -float PhotCat (Measure *measure) { - - int Np; - float Mcat; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; + PhotCode *code = &photcodes[0].code[Np]; + + float Mraw = NAN; + switch (class) { + case MAG_CLASS_PSF: + Mraw = measure[0].M; + break; + case MAG_CLASS_KRON: + Mraw = measure[0].Mkron; + break; + case MAG_CLASS_APER: + Mraw = measure[0].Map; + break; + default: + break; + } + if (code->type == PHOT_REF) { + return (Mraw); + } + float Minst = Mraw - measure[0].dt - ZERO_POINT; + + return (Minst); +} + +float PhotCat (Measure *measure, dvoMagClassType class) { + + int Np = photcodes[0].hashcode[measure[0].photcode]; if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mcat = measure[0].M; - return (Mcat); - } - code = &photcodes[0].code[Np]; - Mcat = measure[0].M - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; + PhotCode *code = &photcodes[0].code[Np]; + + float Mraw = NAN; + switch (class) { + case MAG_CLASS_PSF: + Mraw = measure[0].M; + break; + case MAG_CLASS_KRON: + Mraw = measure[0].Mkron; + break; + case MAG_CLASS_APER: + Mraw = measure[0].Map; + break; + default: + break; + } + if (code->type == PHOT_REF) { + return (Mraw); + } + + float Mcat = Mraw - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; return (Mcat); } -float PhotSys (Measure *measure, Average *average, SecFilt *secfilt) { - - int i, Np; - float Mcat, Mcol, Msys, mc, Mc; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; +float PhotSys (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) { + + int Np = photcodes[0].hashcode[measure[0].photcode]; if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Msys = measure[0].M; - return (Msys); - } - code = &photcodes[0].code[Np]; - Mcat = measure[0].M - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; + PhotCode *code = &photcodes[0].code[Np]; + + float Mraw = NAN; + switch (class) { + case MAG_CLASS_PSF: + Mraw = measure[0].M; + break; + case MAG_CLASS_KRON: + Mraw = measure[0].Mkron; + break; + case MAG_CLASS_APER: + Mraw = measure[0].Map; + break; + default: + break; + } + if (code->type == PHOT_REF) { + return (Mraw); + } + float Mcat = Mraw - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; /* for DEP, color must be made of PRI/SEC */ - mc = PhotColorForCode (average, secfilt, NULL, code); + float mc = PhotColorForCode (average, secfilt, NULL, code); if (isnan(mc)) return (Mcat); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; + mc -= SCALE*code[0].dX; + + int i = 0; + double Mc = mc; + float Mcol = 0; for (i = 0; i < code[0].Nc; i++) { Mcol += code[0].X[i]*Mc; Mc *= mc; } - Msys = Mcat + Mcol; + float Msys = Mcat + Mcol; return (Msys); } -float PhotRel (Measure *measure, Average *average, SecFilt *secfilt) { - - int i, Np; - float Mcat, Mcol, Mrel, mc, Mc; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; +float PhotRel (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) { + + int Np = photcodes[0].hashcode[measure[0].photcode]; if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mcat = measure[0].M; - return (Mcat); - } - code = &photcodes[0].code[Np]; - Mrel = measure[0].M - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal; + PhotCode *code = &photcodes[0].code[Np]; + + float Mraw = NAN; + switch (class) { + case MAG_CLASS_PSF: + Mraw = measure[0].M; + break; + case MAG_CLASS_KRON: + Mraw = measure[0].Mkron; + break; + case MAG_CLASS_APER: + Mraw = measure[0].Map; + break; + default: + break; + } + if (code->type == PHOT_REF) { + return (Mraw); + } + float Mcat = Mraw - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal; /* for DEP, color must be made of PRI/SEC */ - mc = PhotColorForCode (average, secfilt, NULL, code); - if (isnan(mc)) return (Mrel); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; + float mc = PhotColorForCode (average, secfilt, NULL, code); + if (isnan(mc)) return (Mcat); + mc -= SCALE*code[0].dX; + + double Mc = mc; + float Mcol = 0; + int i = 0; + for (i = 0; i < code[0].Nc; i++) { + Mcol += code[0].X[i]*Mc; + Mc *= mc; + } + float Mrel = Mcat + Mcol; + return (Mrel); +} + +/* return calibrated magnitude from measure for given photcode */ +float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code, dvoMagClassType class) { + + int i; + + if (code == NULL) return NAN; + + /* code must be the matching PRI/SEC code for this measurement or an equivalent ALT */ + int Np = photcodes[0].hashcode[thisone[0].photcode]; + if (Np == -1) return (NAN); + PhotCode *myCode = &photcodes[0].code[Np]; + + if (code->code != myCode->equiv) return (NAN); + + // if we are REF type, just get the right version and return + if (myCode->type == PHOT_REF) { + float Mraw = NAN; + switch (class) { + case MAG_CLASS_PSF: + Mraw = thisone[0].M; + break; + case MAG_CLASS_KRON: + Mraw = thisone[0].Mkron; + break; + case MAG_CLASS_APER: + Mraw = thisone[0].Map; + break; + default: + break; + } + return (Mraw); + } + + float Mcal = PhotRel (thisone, average, secfilt, class) + SCALE*code[0].C; + + float mc = PhotColorForCode (average, secfilt, measure, code); + if (isnan(mc)) return (Mcal); + mc -= SCALE*code[0].dX; + + double Mc = mc; + float Mcol = 0; + for (i = 0; i < code[0].Nc; i++) { + Mcol += code[0].X[i]*Mc; + Mc *= mc; + } + Mcal += Mcol; + return (Mcal); +} + +/***/ +float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) { + + if (code == NULL) return NAN; + + int Ns = photcodes[0].hashNsec[code[0].code]; + if (Ns == -1) return (NAN); + + float Mave = NAN; + switch (source) { + case MAG_SRC_CHP: + switch (class) { + case MAG_CLASS_PSF: + Mave = secfilt[Ns].M; + break; + case MAG_CLASS_KRON: + Mave = secfilt[Ns].Mkron; + break; + case MAG_CLASS_APER: + Mave = secfilt[Ns].Map; + break; + default: + break; + } + break; + case MAG_SRC_WRP: + switch (class) { + case MAG_CLASS_PSF: + Mave = secfilt[Ns].MpsfWrp; + break; + case MAG_CLASS_KRON: + Mave = secfilt[Ns].MkronWrp; + break; + case MAG_CLASS_APER: + Mave = secfilt[Ns].MapWrp; + break; + default: + break; + } + break; + case MAG_SRC_STK: + switch (class) { + case MAG_CLASS_PSF: + Mave = secfilt[Ns].MpsfStk; + break; + case MAG_CLASS_KRON: + Mave = secfilt[Ns].MkronStk; + break; + case MAG_CLASS_APER: + Mave = secfilt[Ns].MapStk; + break; + default: + break; + } + break; + default: + break; + } + return (Mave); +} + +/* return calibrated magnitude from average/secfilt for given photcode */ +float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure, dvoMagClassType class, dvoMagSourceType source) { + + int i; + + float Mave = PhotAve (code, average, secfilt, class, source); + if (isnan(Mave)) return NAN; + + // correct for relative zero-point + float Mref = Mave + SCALE*code[0].C; + + float mc = PhotColorForCode (average, secfilt, measure, code); + if (isnan(mc)) return (Mref); + mc -= SCALE*code[0].dX; + + // correct for color terms + double Mc = mc; + float Mcol = 0; for (i = 0; i < code[0].Nc; i++) { Mcol += code[0].X[i]*Mc; Mc *= mc; /* the 0.001 is needed for higher order terms to keep the units mag = mag^n */ } - Mrel += Mcol; - return (Mrel); -} - -/* return calibrated magnitude from measure for given photcode */ -float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code) { - - int i, Np; - float Mcal, Mrel, Mcol, mc, Mc; - - if (code == NULL) return NAN; - - /* code must be the matching PRI/SEC code for this measurement or an equivalent ALT */ - Np = photcodes[0].hashcode[thisone[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mrel = thisone[0].M; - return (Mrel); - } - if (code[0].code != photcodes[0].code[Np].equiv) return (NAN); - - Mcal = PhotRel (thisone, average, secfilt) + SCALE*code[0].C; - - mc = PhotColorForCode (average, secfilt, measure, code); - if (isnan(mc)) return (Mcal); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; - } - Mcal += Mcol; - return (Mcal); -} - -/***/ -float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt) { - - int Ns; - float Mave; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - Mave = (Ns == -1) ? NAN : secfilt[Ns].M; - return (Mave); -} - -/* return calibrated magnitude from average/secfilt for given photcode */ -float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) { - - int i, Ns; - float Mave, Mref, Mcol, mc; - double Mc; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - Mave = (Ns == -1) ? NAN : secfilt[Ns].M; - Mref = Mave + SCALE*code[0].C; - - mc = PhotColorForCode (average, secfilt, measure, code); - if (isnan(mc)) return (Mref); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; /* the 0.001 is needed for higher order terms to keep the units mag = mag^n */ - } Mref += Mcol; return (Mref); } -float PhotAveErr (PhotCode *code, Average *average, SecFilt *secfilt) { - - int Ns; - float dM; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - dM = (Ns == -1) ? NAN : secfilt[Ns].dM; - return (dM); -} - -/************************************** APERTURE-related Magnitudes ***********************************************/ - -float PhotAperInst (Measure *measure) { - - int Np; - float Minst; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Minst = measure[0].Map; - return (Minst); - } - Minst = measure[0].Map - measure[0].dt - ZERO_POINT; - - return (Minst); -} - -float PhotAperCat (Measure *measure) { - - int Np; - float Mcat; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mcat = measure[0].Map; - return (Mcat); - } - code = &photcodes[0].code[Np]; - Mcat = measure[0].Map - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; - - return (Mcat); -} - -float PhotAperSys (Measure *measure, Average *average, SecFilt *secfilt) { - - int i, Np; - float Mcat, Mcol, Msys, mc, Mc; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mcat = measure[0].Map; - return (Mcat); - } - code = &photcodes[0].code[Np]; - Mcat = measure[0].Map - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; - - /* for DEP, color must be made of PRI/SEC */ - mc = PhotColorForCode (average, secfilt, NULL, code); - if (isnan(mc)) return (Mcat); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; - } - Msys = Mcat + Mcol; - return (Msys); -} - -float PhotAperRel (Measure *measure, Average *average, SecFilt *secfilt) { - - int i, Np; - float Mcat, Mcol, Mrel, mc, Mc; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mcat = measure[0].Map; - return (Mcat); - } - code = &photcodes[0].code[Np]; - Mrel = measure[0].Map - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal; - - /* for DEP, color must be made of PRI/SEC */ - mc = PhotColorForCode (average, secfilt, NULL, code); - if (isnan(mc)) return (Mrel); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; /* the 0.001 is needed for higher order terms to keep the units mag = mag^n */ - } - Mrel += Mcol; - return (Mrel); -} - -/* return calibrated magnitude from measure for given photcode */ -float PhotAperCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code) { - - int i, Np; - float Mcal, Mrel, Mcol, mc, Mc; - - if (code == NULL) return NAN; - - /* code must be the matching PRI/SEC code for this measurement or an equivalent ALT */ - Np = photcodes[0].hashcode[thisone[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mrel = thisone[0].Map; - return (Mrel); - } - if (code[0].code != photcodes[0].code[Np].equiv) return (NAN); - - Mcal = PhotAperRel (thisone, average, secfilt) + SCALE*code[0].C; - - mc = PhotColorForCode (average, secfilt, measure, code); - if (isnan(mc)) return (Mcal); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; - } - Mcal += Mcol; - return (Mcal); -} - -float PhotAperAve (PhotCode *code, Average *average, SecFilt *secfilt) { - - int Ns; - float Maper; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - Maper = (Ns == -1) ? NAN : secfilt[Ns].Map; - return (Maper); -} - -/* return calibrated magnitude from average/secfilt for given photcode */ -float PhotAperRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) { - - int i, Ns; - float Mave, Mref, Mcol, mc; - double Mc; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - Mave = (Ns == -1) ? NAN : secfilt[Ns].Map; - Mref = Mave + SCALE*code[0].C; - - mc = PhotColorForCode (average, secfilt, measure, code); - if (isnan(mc)) return (Mref); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; /* the 0.001 is needed for higher order terms to keep the units mag = mag^n */ - } - Mref += Mcol; - return (Mref); -} - -/************************************** KRON-related Magnitudes ***********************************************/ - -float PhotKronInst (Measure *measure) { - - int Np; - float Minst; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Minst = measure[0].Mkron; - return (Minst); - } - Minst = measure[0].Mkron - measure[0].dt - ZERO_POINT; - - return (Minst); -} - -float PhotKronCat (Measure *measure) { - - int Np; - float Mcat; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mcat = measure[0].Mkron; - return (Mcat); - } - code = &photcodes[0].code[Np]; - Mcat = measure[0].Mkron - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; - - return (Mcat); -} - -float PhotKronSys (Measure *measure, Average *average, SecFilt *secfilt) { - - int i, Np; - float Mcat, Mcol, Msys, mc, Mc; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Msys = measure[0].Mkron; - return (Msys); - } - code = &photcodes[0].code[Np]; - Mcat = measure[0].Mkron - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C; - - /* for DEP, color must be made of PRI/SEC */ - mc = PhotColorForCode (average, secfilt, NULL, code); - if (isnan(mc)) return (Mcat); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; - } - Msys = Mcat + Mcol; - return (Msys); -} - -float PhotKronRel (Measure *measure, Average *average, SecFilt *secfilt) { - - int i, Np; - float Mcat, Mcol, Mrel, mc, Mc; - PhotCode *code; - - Np = photcodes[0].hashcode[measure[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mcat = measure[0].Mkron; - return (Mcat); - } - code = &photcodes[0].code[Np]; - Mrel = measure[0].Mkron - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal; - - /* for DEP, color must be made of PRI/SEC */ - mc = PhotColorForCode (average, secfilt, NULL, code); - if (isnan(mc)) return (Mrel); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; /* the 0.001 is needed for higher order terms to keep the units mag = mag^n */ - } - Mrel += Mcol; - return (Mrel); -} - -/* return calibrated magnitude from measure for given photcode */ -float PhotKronCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code) { - - int i, Np; - float Mcal, Mrel, Mcol, mc, Mc; - - if (code == NULL) return NAN; - - /* code must be the matching PRI/SEC code for this measurement or an equivalent ALT */ - Np = photcodes[0].hashcode[thisone[0].photcode]; - if (Np == -1) return (NAN); - - if (photcodes[0].code[Np].type == PHOT_REF) { - Mrel = thisone[0].Mkron; - return (Mrel); - } - if (code[0].code != photcodes[0].code[Np].equiv) return (NAN); - - Mcal = PhotKronRel (thisone, average, secfilt) + SCALE*code[0].C; - - mc = PhotColorForCode (average, secfilt, measure, code); - if (isnan(mc)) return (Mcal); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; - } - Mcal += Mcol; - return (Mcal); -} - -float PhotKronAve (PhotCode *code, Average *average, SecFilt *secfilt) { - - int Ns; - float Mkron; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - Mkron = (Ns == -1) ? NAN : secfilt[Ns].Mkron; - return (Mkron); -} - -/* return calibrated magnitude from average/secfilt for given photcode */ -float PhotKronRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) { - - int i, Ns; - float Mave, Mref, Mcol, mc; - double Mc; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - Mave = (Ns == -1) ? NAN : secfilt[Ns].Mkron; - Mref = Mave + SCALE*code[0].C; - - mc = PhotColorForCode (average, secfilt, measure, code); - if (isnan(mc)) return (Mref); - mc = mc - SCALE*code[0].dX; - - Mc = mc; - Mcol = 0; - for (i = 0; i < code[0].Nc; i++) { - Mcol += code[0].X[i]*Mc; - Mc *= mc; /* the 0.001 is needed for higher order terms to keep the units mag = mag^n */ - } - Mref += Mcol; - return (Mref); -} - -float PhotKronAveErr (PhotCode *code, Average *average, SecFilt *secfilt) { - - int Ns; - float dMkron; - - if (code == NULL) return NAN; - - Ns = photcodes[0].hashNsec[code[0].code]; - dMkron = (Ns == -1) ? NAN : secfilt[Ns].dMkron; - return (dMkron); +float PhotErr (Measure *measure, dvoMagClassType class) { + + float dMraw = NAN; + switch (class) { + case MAG_CLASS_PSF: + dMraw = measure[0].dM; + break; + case MAG_CLASS_KRON: + dMraw = measure[0].dMkron; + break; + case MAG_CLASS_APER: + dMraw = measure[0].dMap; + break; + default: + break; + } + return (dMraw); +} + +float PhotAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) { + + if (code == NULL) return NAN; + + int Ns = photcodes[0].hashNsec[code[0].code]; + if (Ns == -1) return (NAN); + + float dMave = NAN; + switch (source) { + case MAG_SRC_CHP: + switch (class) { + case MAG_CLASS_PSF: + dMave = secfilt[Ns].dM; + break; + case MAG_CLASS_KRON: + dMave = secfilt[Ns].dMkron; + break; + case MAG_CLASS_APER: + dMave = secfilt[Ns].dMap; + break; + default: + break; + } + break; + case MAG_SRC_WRP: + switch (class) { + case MAG_CLASS_PSF: + dMave = secfilt[Ns].dFpsfWrp / secfilt[Ns].FpsfWrp; + break; + case MAG_CLASS_KRON: + dMave = secfilt[Ns].dFkronWrp / secfilt[Ns].FkronWrp; + break; + case MAG_CLASS_APER: + dMave = secfilt[Ns].dFapWrp / secfilt[Ns].FapWrp; + break; + default: + break; + } + break; + case MAG_SRC_STK: + switch (class) { + case MAG_CLASS_PSF: + dMave = secfilt[Ns].dFpsfStk / secfilt[Ns].FpsfStk; + break; + case MAG_CLASS_KRON: + dMave = secfilt[Ns].dFkronStk / secfilt[Ns].FkronStk; + break; + case MAG_CLASS_APER: + dMave = secfilt[Ns].dFapStk / secfilt[Ns].FapStk; + break; + default: + break; + } + break; + default: + break; + } + return (dMave); }