Index: trunk/Ohana/src/libdvo/Makefile =================================================================== --- trunk/Ohana/src/libdvo/Makefile (revision 35263) +++ trunk/Ohana/src/libdvo/Makefile (revision 35416) @@ -36,5 +36,6 @@ $(DESTINC)/ps1_v3_defs.h \ $(DESTINC)/ps1_v4_defs.h \ -$(DESTINC)/ps1_ref_defs.h +$(DESTINC)/ps1_ref_defs.h \ +$(DESTINC)/cmf-ps1-dv3.h INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h $(DESTINC)/get_graphdata.h @@ -84,4 +85,5 @@ $(SRC)/cmf-ps1-v1-alt.$(ARCH).o \ $(SRC)/cmf-ps1-sv1-alt.$(ARCH).o \ +$(SRC)/cmf-ps1-dv3.$(ARCH).o \ $(SRC)/dvo_util.$(ARCH).o \ $(SRC)/dbBooleanCond.$(ARCH).o \ Index: trunk/Ohana/src/libdvo/include/cmf-ps1-dv3.h =================================================================== --- trunk/Ohana/src/libdvo/include/cmf-ps1-dv3.h (revision 35416) +++ trunk/Ohana/src/libdvo/include/cmf-ps1-dv3.h (revision 35416) @@ -0,0 +1,61 @@ + +/** STRUCT DEFINITION **/ +typedef struct { + unsigned int detID; // detection ID + float X; // x coord (pixels) + float Y; // y coord (pixels) + float dX; // x coord error (pixels) + float dY; // y coord error (pixels) + float posangle; // Posangle at source (degrees) + float pltscale; // Plate Scale at source (arcsec/pixel) + float M; // inst mags (mags) + float dM; // inst mag error (mags) + float Flux; // psf flux (counts) + float dFlux; // psf flux error (counts ) + float Map; // standard aperture mag (mags) + float MapRaw; // raw aperture mag (mags) + float apRadius; // radius used for fit (pixels) + float apFlux; // ap flux + float apFluxErr; // ap flux err + float Mpeak; // peak flux as a mag (mags) + float Mcalib; // calibrated psf mag (mags) + float dMcal; // zero point scatter (mags) + double RA; // PSF RA coord (degrees) + double DEC; // PSF DEC coord (degrees) + float sky; // sky flux (cnts/sec) + float dSky; // sky flux error (cnts/sec) + float psfChisq; // psf fit chisq + float crNsigma; // Nsigma deviations from PSF to CF + float extNsigma; // Nsigma deviations from PSF to EXT + float fx; // psf fit major axis (pixels) + float fy; // psf fit minor axis (pixels) + float df; // ellipse angle (degrees) + float psfQF; // quality factor + float psfQFperf; // quality factor perfect + int psfNdof; // psf degrees of freedom + int psfNpix; // psf number of pixels + float Mxx; // second moment X (pixels^2) + float Mxy; // second moment Y (pixels^2) + float Myy; // second moment XY (pixels^2) + float Mr1; // first radial moment (pixels) + float Mrh; // half radial moment (pixels^1/2) + float kronFlux; // kron flux (counts) + float kronFluxErr; // kron flux error (counts) + float kronInner; // kron flux 1ID) { - case MEAS_MAG: /* magnitudes are already determined above */ - equiv = GetPhotcodeEquivbyCode (measure[0].photcode); - - // we return the magnitude for this measure if: - if (field->photcode->type == PHOT_MAG) goto valid_photcode; + case MEAS_MAG: { /* magnitudes are already determined above */ + PhotCode *myEquiv = GetPhotcodeEquivbyCode (measure[0].photcode); + + // if we request mag:ave, use equiv for photcode + if (field->photcode->type == PHOT_MAG) { + equiv = myEquiv; + goto valid_photcode; + } + + // if we ask for 2MASS_K, etc (REF values), return NAN unless measure->code matches if ((field->photcode->type == PHOT_REF) && (measure[0].photcode == field->photcode->code)) goto valid_photcode; + + // if we ask for GPC1.g.XY03:rel, etc (DEP values), return NAN unless measure->code matches if ((field->photcode->type == PHOT_DEP) && (measure[0].photcode == field->photcode->code)) goto valid_photcode; - if ((equiv != NULL) && (field->photcode->type == PHOT_SEC) && (equiv[0].code == field->photcode->code)) goto valid_photcode; + // if we ask for g:ave, or other SEC-level values, return the corresponding field + if (field->photcode->type == PHOT_SEC) { + switch (field->magMode) { + // 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_APER: + case MAG_APER_INST: + case MAG_KRON: + case MAG_KRON_INST: + case MAG_KRON_ERR: + case MAG_ERR: + case MAG_PHOT_FLAGS: + equiv = myEquiv; + if (equiv && (equiv->code == field->photcode->code)) goto valid_photcode; + break; + + // mean-like : return value for the given photcode + case MAG_AVE: + case MAG_REF: + case MAG_CHISQ: + case MAG_AVE_ERR: + case MAG_NCODE: + case MAG_NPHOT: + case MAG_FLUX_PSF: + case MAG_FLUX_PSF_ERR: + case MAG_FLUX_KRON: + case MAG_FLUX_KRON_ERR: + equiv = field->photcode; + goto valid_photcode; + break; + default: + fprintf (stderr, "error"); + return value; + } + } break; @@ -182,4 +241,5 @@ } break; + } case MEAS_RA: /* OK */ value.Flt = average[0].R - measure[0].dR / 3600.0; @@ -465,19 +525,69 @@ value.Flt = FromShortPixels(measure[0].dRsys); break; - case MEAS_XMOSAIC: /* OK */ - ra = average[0].R - measure[0].dR / 3600.0; - dec = average[0].D - measure[0].dD / 3600.0; - mosaic = MatchMosaicMetadata (measure[0].imageID); - if (mosaic == NULL) break; - RD_to_XY (&x, &y, ra, dec, mosaic); - value.Flt = x; + + case MEAS_XFIELD: /* offset relative to exposure center in ra,dec space */ + if (!haveFieldMeas) { + if (REMOTE_CLIENT) { + fieldc = MatchFieldMetadata (measure[0].imageID); + } else { + fprintf (stderr, "non-parallel Xmos broken\n"); + abort(); + // fieldc = MatchField (measure[0].t, measure[0].photcode); + } + if (fieldc == NULL) break; + double Rm = average[0].R - measure[0].dR / 3600.0; + double Dm = average[0].D - measure[0].dD / 3600.0; + RD_to_XY (&XFIELD_MEAS, &YFIELD_MEAS, Rm, Dm, fieldc); + } + value.Flt = XFIELD_MEAS; + break; + case MEAS_YFIELD: /* OK */ + if (!haveFieldMeas) { + if (REMOTE_CLIENT) { + fieldc = MatchFieldMetadata (measure[0].imageID); + } else { + fprintf (stderr, "non-parallel Xmos broken\n"); + abort(); + // fieldc = MatchField (measure[0].t, measure[0].photcode); + } + if (fieldc == NULL) break; + double Rm = average[0].R - measure[0].dR / 3600.0; + double Dm = average[0].D - measure[0].dD / 3600.0; + RD_to_XY (&XFIELD_MEAS, &YFIELD_MEAS, Rm, Dm, fieldc); + } + value.Flt = YFIELD_MEAS; + break; + + case MEAS_XMOSAIC: /* offset relative to exposure center in camera coords */ + if (!haveMosaicMeas) { + if (REMOTE_CLIENT) { + mosaic = MatchMosaicMetadata (measure[0].imageID); + } else { + fprintf (stderr, "non-parallel Xmos broken\n"); + abort(); + mosaic = MatchMosaic (measure[0].t, measure[0].photcode); + } + if (mosaic == NULL) break; + double Rm = average[0].R - measure[0].dR / 3600.0; + double Dm = average[0].D - measure[0].dD / 3600.0; + RD_to_XY (&XMOS_MEAS, &YMOS_MEAS, Rm, Dm, mosaic); + } + value.Flt = XMOS_MEAS; break; case MEAS_YMOSAIC: /* OK */ - ra = average[0].R - measure[0].dR / 3600.0; - dec = average[0].D - measure[0].dD / 3600.0; - mosaic = MatchMosaic (measure[0].t, measure[0].photcode); - if (mosaic == NULL) break; - RD_to_XY (&x, &y, ra, dec, mosaic); - value.Flt = y; + if (!haveMosaicMeas) { + if (REMOTE_CLIENT) { + mosaic = MatchMosaicMetadata (measure[0].imageID); + } else { + fprintf (stderr, "non-parallel Xmos broken\n"); + abort(); + mosaic = MatchMosaic (measure[0].t, measure[0].photcode); + } + if (mosaic == NULL) break; + double Rm = average[0].R - measure[0].dR / 3600.0; + double Dm = average[0].D - measure[0].dD / 3600.0; + RD_to_XY (&XMOS_MEAS, &YMOS_MEAS, Rm, Dm, mosaic); + } + value.Flt = YMOS_MEAS; break; Index: trunk/Ohana/src/libdvo/src/dbFields.c =================================================================== --- trunk/Ohana/src/libdvo/src/dbFields.c (revision 35263) +++ trunk/Ohana/src/libdvo/src/dbFields.c (revision 35416) @@ -87,4 +87,9 @@ 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; + } free (tmpstring); return (code); @@ -220,4 +225,6 @@ 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); @@ -254,5 +261,5 @@ // check for code:mode in photcode name - code = ParsePhotcodeField (fieldName, &mode, MAG_REL); + code = ParsePhotcodeField (fieldName, &mode, MAG_AVE); if (code == NULL) { gprint (GP_ERR, "unknown field '%s' for measurement table in DVO database\n", fieldName); Index: trunk/Ohana/src/libdvo/src/dvo_catalog.c =================================================================== --- trunk/Ohana/src/libdvo/src/dvo_catalog.c (revision 35263) +++ trunk/Ohana/src/libdvo/src/dvo_catalog.c (revision 35416) @@ -112,4 +112,14 @@ // init all data, or just catalog data +void dvo_averageT_init (AverageTiny *average) { + average->R = 0; + average->D = 0; + average->flags = 0; + average->Nmeasure = 0; + average->measureOffset = -1; + average->catID = 0; +} + +// init all data, or just catalog data void dvo_secfilt_init (SecFilt *secfilt) { secfilt->M = NAN; @@ -142,5 +152,4 @@ measure->dR = NAN; measure->dD = NAN; - measure->M = NAN; measure->Mcal = NAN; measure->Map = NAN; @@ -203,4 +212,34 @@ measure->dbFlags = 0; measure->photFlags = 0; +} + +void dvo_measureT_init (MeasureTiny *measure) { + measure->dR = NAN; + measure->dD = NAN; + measure->M = NAN; + measure->Mcal = NAN; + measure->dM = NAN; + + measure->airmass = NAN; + measure->Xccd = NAN; + measure->Yccd = NAN; + measure->Xfix = NAN; + measure->Yfix = NAN; + + measure->t = 0; + measure->dt = NAN; + measure->averef = 0; + + measure->imageID = 0; + + measure->dbFlags = 0; + measure->photFlags = 0; + measure->photcode = 0; + + measure->catID = 0; + + measure->dXccd = 0; + measure->dYccd = 0; + measure->dRsys = 0; }