Index: trunk/ppTranslate/src/ppMopsRead.c =================================================================== --- trunk/ppTranslate/src/ppMopsRead.c (revision 32396) +++ trunk/ppTranslate/src/ppMopsRead.c (revision 32406) @@ -20,10 +20,12 @@ psArray *detections = psArrayAlloc(num); // Array of detections, to return for (int i = 0; i < num; i++) { - psFits *fits = psFitsOpen(inNames->data[i], "r"); // FITS file - + const char *name = inNames->data[i]; + + psFits *fits = psFitsOpen(name, "r"); // FITS file if (!fits) { psError(PS_ERR_IO, false, "Unable to open input %d", i); return false; } + psMetadata *header = psFitsReadHeader(NULL, fits); // Primary header if (!header) { @@ -74,4 +76,8 @@ } ppMopsDetections *det = ppMopsDetectionsAlloc(size); + detections->data[i] = det; + det->component = psStringNCopy(name, strrchr(name, '.') - name); // Strip off extension + det->num = size; + det->diffSkyfileId = diffSkyfileId; psTrace("ppMops.read", 3, "Reading %ld rows from %s\n", size, (const char*)inNames->data[i]); @@ -90,18 +96,52 @@ psMetadataLookupF32(NULL, header, "FWHM_MIN")); - int naxis1 = psMetadataLookupS32(NULL, header, "IMNAXIS1"); // Number of columns - int naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2"); // Number of rows + det->naxis1 = psMetadataLookupS32(NULL, header, "IMNAXIS1"); // Number of columns + det->naxis2 = psMetadataLookupS32(NULL, header, "IMNAXIS2"); // Number of rows psFree(header); -#ifndef USE_OLD_READ_TABLE - // use new fits table functions - - psFitsTable *table = psFitsReadTableNew(fits); // Table of interest + psMetadata *table = psFitsReadTableAllColumns(fits); // Table of interest if (!table) { psError(PS_ERR_IO, false, "Unable to read table %d", i); - return false; - } + return NULL; + } + det->table = table; psFitsClose(fits); + if (args->version == 0) { + if (skyChipPsfVersion < 2) { + // XXX: TODO: Do we need to add dummy vectors for the missing columns? + } + } + + psVector *ra = psMetadataLookupVector(NULL, table, "RA_PSF"); + psVector *dec = psMetadataLookupVector(NULL, table, "DEC_PSF"); + + det->raErr = psVectorAlloc(size, PS_TYPE_F64); + det->decErr = psVectorAlloc(size, PS_TYPE_F64); + det->mask = psVectorAlloc(size, PS_TYPE_U8); + + // convert ra and dec to radians for use in the purge duplicates function + det->ra = (psVector*)psBinaryOp(NULL, ra, "*", psScalarAlloc(DEG_TO_RAD(1.0), PS_TYPE_F64)); + det->dec = (psVector*)psBinaryOp(NULL, dec, "*", psScalarAlloc(DEG_TO_RAD(1.0), PS_TYPE_F64)); + det->x = psMemIncrRefCounter(psMetadataLookupVector(NULL, table, "X_PSF")); + det->y = psMemIncrRefCounter(psMetadataLookupVector(NULL, table, "Y_PSF")); + if (!det->ra || !det->dec || !det->x || !det->y) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find all of RA, Dec, X and Y columns"); + return NULL; + } + + // Add our new vectors to the table so that duplicates and masked items may be purged + psMetadataAddVector(table, PS_LIST_HEAD, "DEC_ERR", 0, NULL, det->decErr); + psMetadataAddVector(table, PS_LIST_HEAD, "RA_ERR", 0, NULL, det->raErr); + + psTrace("ppMops.read", 2, "Read %ld rows from %s\n", det->num, det->component); + + psVector *mag = psMetadataLookupVector(NULL, table, "PSF_INST_MAG"); + psVector *magErr = psMetadataLookupVector(NULL, table, "PSF_INST_MAG_SIG"); + psVector *xErrV = psMetadataLookupVector(NULL, table, "X_PSF_SIG"); + psVector *yErrV = psMetadataLookupVector(NULL, table, "Y_PSF_SIG"); + psVector *scaleV = psMetadataLookupVector(NULL, table, "PLTSCALE"); + psVector *angleV = psMetadataLookupVector(NULL, table, "POSANGLE"); + psVector *flagsV = psMetadataLookupVector(NULL, table, "FLAGS"); double plateScale = 0.0; // Plate scale @@ -109,109 +149,21 @@ for (long row = 0; row < size; row++) { - psU32 flags = psFitsTableGetU32(NULL, table, row, "FLAGS"); + psU32 flags = flagsV->data.U32[row]; // psFitsTableGetU32(NULL, table, row, "FLAGS"); if (flags & SOURCE_MASK) { psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of flags: %ud", row, i, flags); + det->mask->data.U8[row] = 0xFF; continue; } - det->x->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "X_PSF"); - det->y->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "Y_PSF"); - det->ra->data.F64[numGood] = DEG_TO_RAD(psFitsTableGetF64(NULL, table, row, "RA_PSF")); - det->dec->data.F64[numGood] = DEG_TO_RAD(psFitsTableGetF64(NULL, table, row, "DEC_PSF")); - det->mag->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_INST_MAG"); - det->magErr->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_INST_MAG_SIG"); - det->chi2->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_CHISQ"); - det->dof->data.S32[numGood] = psFitsTableGetS32(NULL, table, row, "PSF_NDOF"); - det->cr->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "CR_NSIGMA"); - det->extended->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "EXT_NSIGMA"); - det->psfMajor->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_MAJOR"); - det->psfMinor->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_MINOR"); - det->psfTheta->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_THETA"); - det->quality->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_QF"); - det->numPix->data.S32[numGood] = psFitsTableGetS32(NULL, table, row, "PSF_NPIX"); - det->xxMoment->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "MOMENTS_XX"); - det->xyMoment->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "MOMENTS_XY"); - det->yyMoment->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "MOMENTS_YY"); - det->flags->data.U32[numGood] = psFitsTableGetU32(NULL, table, row, "FLAGS"); - det->diffSkyfileId->data.S64[numGood] = diffSkyfileId; - det->naxis1->data.S32[numGood] = naxis1; - det->naxis2->data.S32[numGood] = naxis2; - det->nPos->data.S32[numGood] = psFitsTableGetS32(NULL, table, row, "DIFF_NPOS"); - det->fPos->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_FRATIO"); - det->nRatioBad->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_NRATIO_BAD"); - det->nRatioMask->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_NRATIO_MASK"); - det->nRatioAll->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_NRATIO_ALL"); - - //Additions of 2010-10-25 - if (args->version == 2) { - //Values are set only if the version is 2 - if (skyChipPsfVersion == 2) { - det->psfInstFlux->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_INST_FLUX"); - det->psfInstFluxSig->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_INST_FLUX_SIG"); - det->apMag->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "AP_MAG"); - det->apMagRaw->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "AP_MAG_RAW"); - det->apMagRadius->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "AP_MAG_RADIUS"); - det->apFlux->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "AP_FLUX"); - det->apFluxSig->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "AP_FLUX_SIG"); - det->peakFluxAsMag->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PEAK_FLUX_AS_MAG"); - det->calPsfMag->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "CAL_PSF_MAG"); - det->calPsfMagSig->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "CAL_PSF_MAG_SIG"); - det->sky->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "SKY"); - det->skySig->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "SKY_SIGMA"); - det->qualityPerfect->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "PSF_QF_PERFECT"); - det->momentsR1->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "MOMENTS_R1"); - det->momentsRH->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "MOMENTS_RH"); - det->kronFlux->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "KRON_FLUX"); - det->kronFluxErr->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "KRON_FLUX_ERR"); - det->kronFluxInner->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "KRON_FLUX_INNER"); - det->kronFluxOuter->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "KRON_FLUX_OUTER"); - det->diffRP->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_R_P"); - det->diffSnP->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_SN_P"); - det->diffRM->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_R_M"); - det->diffSnM->data.F32[numGood] = psFitsTableGetF32(NULL, table, row, "DIFF_SN_M"); - det->flags2->data.U32[numGood] = psFitsTableGetU32(NULL, table, row, "FLAGS2"); - det->ippIdet->data.U32[numGood] = psFitsTableGetU32(NULL, table, row, "IPP_IDET"); - det->nFrames->data.U16[numGood] = psFitsTableGetU16(NULL, table, row, "N_FRAMES"); - det->padding->data.S16[numGood] = psFitsTableGetS16(NULL, table, row, "PADDING"); - } else { - det->psfInstFlux->data.F32[numGood] = NAN; - det->psfInstFluxSig->data.F32[numGood] = NAN; - det->apMag->data.F32[numGood] = NAN; - det->apMagRaw->data.F32[numGood] = NAN; - det->apMagRadius->data.F32[numGood] = NAN; - det->apFlux->data.F32[numGood] = NAN; - det->apFluxSig->data.F32[numGood] = NAN; - det->peakFluxAsMag->data.F32[numGood] = NAN; - det->calPsfMag->data.F32[numGood] = NAN; - det->calPsfMagSig->data.F32[numGood] = NAN; - det->sky->data.F32[numGood] = NAN; - det->skySig->data.F32[numGood] = NAN; - det->qualityPerfect->data.F32[numGood] = NAN; - det->momentsR1->data.F32[numGood] = NAN; - det->momentsRH->data.F32[numGood] = NAN; - det->kronFlux->data.F32[numGood] = NAN; - det->kronFluxErr->data.F32[numGood] = NAN; - det->kronFluxInner->data.F32[numGood] = NAN; - det->kronFluxOuter->data.F32[numGood] = NAN; - det->diffRP->data.F32[numGood] = NAN; - det->diffSnP->data.F32[numGood] = NAN; - det->diffRM->data.F32[numGood] = NAN; - det->diffSnM->data.F32[numGood] = NAN; - det->flags2->data.U32[numGood] = 0; - det->ippIdet->data.U32[numGood] = 0; - det->nFrames->data.U16[numGood] = 0; - det->padding->data.S16[numGood] = 0; - } - } - // Calculate error in RA, Dec - double xErr = psFitsTableGetF64(NULL, table, row, "X_PSF_SIG"); //SC: Warning! Promotion of F32 - double yErr = psFitsTableGetF64(NULL, table, row, "Y_PSF_SIG"); //SC: Warning! Promotion of F32 - double scale = psFitsTableGetF64(NULL, table, row, "PLTSCALE"); //SC: Warning! Promotion of F32 - double angle = psFitsTableGetF64(NULL, table, row, "POSANGLE"); //SC: Warning! Promotion of F32 - - if (!isfinite(det->x->data.F32[numGood]) || !isfinite(det->y->data.F32[numGood]) || - !isfinite(det->ra->data.F64[numGood]) || !isfinite(det->dec->data.F64[numGood]) || - !isfinite(det->mag->data.F32[numGood]) || !isfinite(det->magErr->data.F32[numGood]) || + + double xErr = xErrV->data.F32[row]; + double yErr = yErrV->data.F32[row]; + double scale = scaleV->data.F32[row]; + double angle = angleV->data.F32[row]; + + if (!isfinite(det->x->data.F32[row]) || !isfinite(det->y->data.F32[row]) || + !isfinite(det->ra->data.F64[row]) || !isfinite(det->dec->data.F64[row]) || + !isfinite(mag->data.F32[row]) || !isfinite(magErr->data.F32[row]) || !isfinite(xErr) || !isfinite(yErr) || !isfinite(scale) || !isfinite(angle)) { psTrace("ppMops.read", 10, @@ -219,8 +171,9 @@ "%f %f %lf %lf %f %f %f %f %f %f", row, i, - det->x->data.F32[numGood], det->y->data.F32[numGood], - det->ra->data.F64[numGood], det->dec->data.F64[numGood], - det->mag->data.F32[numGood], det->magErr->data.F32[numGood], + det->x->data.F32[row], det->y->data.F32[row], + det->ra->data.F64[row], det->dec->data.F64[row], + mag->data.F32[row], magErr->data.F32[row], xErr, yErr, scale, angle); + det->mask->data.U8[row] = 0xFF; continue; } @@ -231,226 +184,21 @@ double xErr2 = PS_SQR(xErr), yErr2 = PS_SQR(yErr); double errScale = scale / 3600.0; - det->raErr->data.F64[numGood] = errScale * sqrt(cosAngle2 * xErr2 + sinAngle2 * yErr2); - det->decErr->data.F64[numGood] = errScale * sqrt(sinAngle2 * xErr2 + cosAngle2 * yErr2); - - det->mask->data.U8[numGood] = 0; + det->raErr->data.F64[row] = errScale * sqrt(cosAngle2 * xErr2 + sinAngle2 * yErr2); + det->decErr->data.F64[row] = errScale * sqrt(sinAngle2 * xErr2 + cosAngle2 * yErr2); + + det->mask->data.U8[row] = 0; plateScale += scale; numGood++; } -#else - // OLD way of reading fits tables read it into an array of metadata objects, one for each row. Uses lots and lots - // and lots of memory. - psArray *table = psFitsReadTable(fits); // Table of interest - if (!table) { - psError(PS_ERR_IO, false, "Unable to read table %d", i); - return false; - } - psFitsClose(fits); - - double plateScale = 0.0; // Plate scale - long numGood = 0; // Number of good rows - for (long j = 0; j < size; j++) { - psMetadata *row = table->data[j]; // Row of interest - - psU32 flags = psMetadataLookupU32(NULL, row, "FLAGS"); - if (flags & SOURCE_MASK) { - psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of flags: %ud", j, i, flags); - continue; - } - - det->x->data.F32[numGood] = psMetadataLookupF32(NULL, row, "X_PSF"); - det->y->data.F32[numGood] = psMetadataLookupF32(NULL, row, "Y_PSF"); - det->ra->data.F64[numGood] = DEG_TO_RAD(psMetadataLookupF64(NULL, row, "RA_PSF")); - det->dec->data.F64[numGood] = DEG_TO_RAD(psMetadataLookupF64(NULL, row, "DEC_PSF")); - det->mag->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_INST_MAG"); - det->magErr->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_INST_MAG_SIG"); - det->chi2->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_CHISQ"); - det->dof->data.S32[numGood] = psMetadataLookupS32(NULL, row, "PSF_NDOF"); - det->cr->data.F32[numGood] = psMetadataLookupF32(NULL, row, "CR_NSIGMA"); - det->extended->data.F32[numGood] = psMetadataLookupF32(NULL, row, "EXT_NSIGMA"); - det->psfMajor->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_MAJOR"); - det->psfMinor->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_MINOR"); - det->psfTheta->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_THETA"); - det->quality->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_QF"); - det->numPix->data.S32[numGood] = psMetadataLookupS32(NULL, row, "PSF_NPIX"); - det->xxMoment->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_XX"); - det->xyMoment->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_XY"); - det->yyMoment->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_YY"); - det->flags->data.U32[numGood] = psMetadataLookupU32(NULL, row, "FLAGS"); - det->diffSkyfileId->data.S64[numGood] = diffSkyfileId; - det->naxis1->data.S32[numGood] = naxis1; - det->naxis2->data.S32[numGood] = naxis2; - det->nPos->data.S32[numGood] = psMetadataLookupS32(NULL, row, "DIFF_NPOS"); - det->fPos->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_FRATIO"); - det->nRatioBad->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_NRATIO_BAD"); - det->nRatioMask->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_NRATIO_MASK"); - det->nRatioAll->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_NRATIO_ALL"); - - //Additions of 2010-10-25 - if (args->version == 2) { - //Values are set only if the version is 2 - if (skyChipPsfVersion == 2) { - det->psfInstFlux->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_INST_FLUX"); - det->psfInstFluxSig->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_INST_FLUX_SIG"); - det->apMag->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_MAG"); - det->apMagRaw->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_MAG_RAW"); - det->apMagRadius->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_MAG_RADIUS"); - det->apFlux->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_FLUX"); - det->apFluxSig->data.F32[numGood] = psMetadataLookupF32(NULL, row, "AP_FLUX_SIG"); - det->peakFluxAsMag->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PEAK_FLUX_AS_MAG"); - det->calPsfMag->data.F32[numGood] = psMetadataLookupF32(NULL, row, "CAL_PSF_MAG"); - det->calPsfMagSig->data.F32[numGood] = psMetadataLookupF32(NULL, row, "CAL_PSF_MAG_SIG"); - det->sky->data.F32[numGood] = psMetadataLookupF32(NULL, row, "SKY"); - det->skySig->data.F32[numGood] = psMetadataLookupF32(NULL, row, "SKY_SIGMA"); - det->qualityPerfect->data.F32[numGood] = psMetadataLookupF32(NULL, row, "PSF_QF_PERFECT"); - det->momentsR1->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_R1"); - det->momentsRH->data.F32[numGood] = psMetadataLookupF32(NULL, row, "MOMENTS_RH"); - det->kronFlux->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX"); - det->kronFluxErr->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_ERR"); - det->kronFluxInner->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_INNER"); - det->kronFluxOuter->data.F32[numGood] = psMetadataLookupF32(NULL, row, "KRON_FLUX_OUTER"); - det->diffRP->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_R_P"); - det->diffSnP->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_SN_P"); - det->diffRM->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_R_M"); - det->diffSnM->data.F32[numGood] = psMetadataLookupF32(NULL, row, "DIFF_SN_M"); - det->flags2->data.U32[numGood] = psMetadataLookupU32(NULL, row, "FLAGS2"); - det->ippIdet->data.U32[numGood] = psMetadataLookupU32(NULL, row, "IPP_IDET"); - det->nFrames->data.U16[numGood] = psMetadataLookupU16(NULL, row, "N_FRAMES"); - det->padding->data.S16[numGood] = psMetadataLookupS16(NULL, row, "PADDING"); - } else { - det->psfInstFlux->data.F32[numGood] = NAN; - det->psfInstFluxSig->data.F32[numGood] = NAN; - det->apMag->data.F32[numGood] = NAN; - det->apMagRaw->data.F32[numGood] = NAN; - det->apMagRadius->data.F32[numGood] = NAN; - det->apFlux->data.F32[numGood] = NAN; - det->apFluxSig->data.F32[numGood] = NAN; - det->peakFluxAsMag->data.F32[numGood] = NAN; - det->calPsfMag->data.F32[numGood] = NAN; - det->calPsfMagSig->data.F32[numGood] = NAN; - det->sky->data.F32[numGood] = NAN; - det->skySig->data.F32[numGood] = NAN; - det->qualityPerfect->data.F32[numGood] = NAN; - det->momentsR1->data.F32[numGood] = NAN; - det->momentsRH->data.F32[numGood] = NAN; - det->kronFlux->data.F32[numGood] = NAN; - det->kronFluxErr->data.F32[numGood] = NAN; - det->kronFluxInner->data.F32[numGood] = NAN; - det->kronFluxOuter->data.F32[numGood] = NAN; - det->diffRP->data.F32[numGood] = NAN; - det->diffSnP->data.F32[numGood] = NAN; - det->diffRM->data.F32[numGood] = NAN; - det->diffSnM->data.F32[numGood] = NAN; - det->flags2->data.U32[numGood] = 0; - det->ippIdet->data.U32[numGood] = 0; - det->nFrames->data.U16[numGood] = 0; - det->padding->data.S16[numGood] = 0; - } - } - - // Calculate error in RA, Dec - double xErr = psMetadataLookupF64(NULL, row, "X_PSF_SIG"); //SC: Warning! Promotion of F32 - double yErr = psMetadataLookupF64(NULL, row, "Y_PSF_SIG"); //SC: Warning! Promotion of F32 - double scale = psMetadataLookupF64(NULL, row, "PLTSCALE"); //SC: Warning! Promotion of F32 - double angle = psMetadataLookupF64(NULL, row, "POSANGLE"); //SC: Warning! Promotion of F32 - - if (!isfinite(det->x->data.F32[numGood]) || !isfinite(det->y->data.F32[numGood]) || - !isfinite(det->ra->data.F64[numGood]) || !isfinite(det->dec->data.F64[numGood]) || - !isfinite(det->mag->data.F32[numGood]) || !isfinite(det->magErr->data.F32[numGood]) || - !isfinite(xErr) || !isfinite(yErr) || !isfinite(scale) || !isfinite(angle)) { - psTrace("ppMops.read", 10, - "Discarding row %ld from input %d because of non-finite values: " - "%f %f %lf %lf %f %f %f %f %f %f", - j, i, - det->x->data.F32[numGood], det->y->data.F32[numGood], - det->ra->data.F64[numGood], det->dec->data.F64[numGood], - det->mag->data.F32[numGood], det->magErr->data.F32[numGood], - xErr, yErr, scale, angle); - continue; - } - - // XXX Not at all sure I've got the angles around the right way here... - double cosAngle = cos(angle), sinAngle = sin(angle); - double cosAngle2 = PS_SQR(cosAngle), sinAngle2 = PS_SQR(sinAngle); - double xErr2 = PS_SQR(xErr), yErr2 = PS_SQR(yErr); - double errScale = scale / 3600.0; - det->raErr->data.F64[numGood] = errScale * sqrt(cosAngle2 * xErr2 + sinAngle2 * yErr2); - det->decErr->data.F64[numGood] = errScale * sqrt(sinAngle2 * xErr2 + cosAngle2 * yErr2); - - det->mask->data.U8[numGood] = 0; - plateScale += scale; - numGood++; - } -#endif det->seeing *= ((float) plateScale) / ((float) numGood); - det->x->n = numGood; - det->y->n = numGood; - det->ra->n = numGood; - det->dec->n = numGood; - det->raErr->n = numGood; - det->decErr->n = numGood; - det->mag->n = numGood; - det->magErr->n = numGood; - det->chi2->n = numGood; - det->dof->n = numGood; - det->cr->n = numGood; - det->extended->n = numGood; - det->psfMajor->n = numGood; - det->psfMinor->n = numGood; - det->psfTheta->n = numGood; - det->quality->n = numGood; - det->numPix->n = numGood; - det->xxMoment->n = numGood; - det->xyMoment->n = numGood; - det->yyMoment->n = numGood; - det->flags->n = numGood; - det->diffSkyfileId->n = numGood; - det->naxis1->n = numGood; - det->naxis2->n = numGood; - det->mask->n = numGood; - det->nPos->n = numGood; - det->fPos->n = numGood; - det->nRatioBad->n = numGood; - det->nRatioMask->n = numGood; - det->nRatioAll->n = numGood; - det->psfInstFlux->n = numGood; - det->psfInstFluxSig->n = numGood; - det->apMag->n = numGood; - det->apMagRaw->n = numGood; - det->apMagRadius->n = numGood; - det->apFlux->n = numGood; - det->apFluxSig->n = numGood; - det->peakFluxAsMag->n = numGood; - det->calPsfMag->n = numGood; - det->calPsfMagSig->n = numGood; - det->sky->n = numGood; - det->skySig->n = numGood; - det->qualityPerfect->n = numGood; - det->momentsR1->n = numGood; - det->momentsRH->n = numGood; - det->kronFlux->n = numGood; - det->kronFluxErr->n = numGood; - det->kronFluxInner->n = numGood; - det->kronFluxOuter->n = numGood; - det->diffRP->n = numGood; - det->diffSnP->n = numGood; - det->diffRM->n = numGood; - det->diffSnM->n = numGood; - det->flags2->n = numGood; - det->ippIdet->n = numGood; - det->nFrames->n = numGood; - det->padding->n = numGood; - - det->num = numGood; + // Are we using numGood for anything outside of this function? + det->numGood = numGood; if (isfinite(args->zp) && numGood > 0) { - psBinaryOp(det->mag, det->mag, "+", psScalarAlloc(args->zp, PS_TYPE_F32)); - } - - psTrace("ppMops.read", 2, "Read %ld good rows from %s\n", numGood, (const char*)inNames->data[i]); - - psFree(table); - detections->data[i] = det; + psBinaryOp(mag, mag, "+", psScalarAlloc(args->zp, PS_TYPE_F32)); + } + + psTrace("ppMops.read", 2, "Read %ld good rows from %s\n", numGood, (const char*)name); }