Index: trunk/ippToPsps/config/test/map.xml =================================================================== --- trunk/ippToPsps/config/test/map.xml (revision 28758) +++ trunk/ippToPsps/config/test/map.xml (revision 28759) @@ -3,96 +3,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - + +
Index: trunk/ippToPsps/config/test/tables.xml =================================================================== --- trunk/ippToPsps/config/test/tables.xml (revision 28758) +++ trunk/ippToPsps/config/test/tables.xml (revision 28759) @@ -2,92 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -96,20 +8,9 @@ - - - - - - + + + + - - - - - - - - -
Index: trunk/ippToPsps/src/ippToPspsBatchTest.c =================================================================== --- trunk/ippToPsps/src/ippToPspsBatchTest.c (revision 28758) +++ trunk/ippToPsps/src/ippToPspsBatchTest.c (revision 28759) @@ -13,15 +13,13 @@ #include "fitsio.h" -// Gets flux from magnitude -static __inline bool ippToPsps_getFlux(const float zeroPoint, const float exposureTime, const float magnitude, float* flux) { - - // use uncalibrated instrumental flux +// Gets uncalibrated instrumental flux from magnitude +static __inline bool ippToPsps_getFlux(const float exposureTime, const float magnitude, float* flux, const float magnitudeErr, float* fluxErr) { + *flux = powf(10.0, -0.4*magnitude) / exposureTime; - - // use calibrated flux in Janskys, where 3631 Jy is the zero point flux for the filter: constant over all filters because we're using AB magnitudes - //float flux = 3631 * powf(10.0, -0.4*(magnitude + zeroPoint)) / exposureTime; - - // printf("mag=%f\texpTime=%f\tzeroPoint=%f\tflux=%f\n", magnitude, exposureTime, zeroPoint, flux); - return (!isfinite(*flux) || *flux < 0.000001) ? false : true; + if (!isfinite(*flux) || *flux < 0.000001) return false; + if (fluxErr) *fluxErr = fabsf((magnitudeErr * *flux)/1.085736); + // if (fluxErr) printf("Mag = %03.03f, Flux = %03.03f, Mag err = %03.03f, Flux Err = %03.03f\n", magnitude, *flux, magnitudeErr, *fluxErr); + + return true; } @@ -29,5 +27,5 @@ \brief test data for checking PSPS values correspond with IPP - */ +*/ int ippToPsps_batchTest(IppToPsps *this) { @@ -53,13 +51,13 @@ status=0; fits_read_key(fitsIn, TFLOAT, "EXPREQ", &exposureTime, NULL, &status); status=0; fits_read_key(fitsIn, TSTRING, "FILTERID", filterType, NULL, &status); - - ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "FrameMeta", true); + +// ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "FrameMeta", true); // FrameMeta values - fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->expId, &status); +// fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->expId, &status); int8_t filterID = -1; ippToPspsConfig_getFilterId(this->config, filterType, &filterID); - fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_FILTERID, 1, 1, 1, &filterID, &status); +// fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_FILTERID, 1, 1, 1, &filterID, &status); // stuff to keep from psf.hdr header @@ -140,5 +138,5 @@ long removeList[MAXDETECT]; long thisObjId; - bool firstTimeIn = true; + bool firstTimeIn = true, peakFluxOk, instFluxOk; int ippIDetNum, instMagNum, instMagErrNum, peakMagNum; @@ -198,14 +196,14 @@ // create ImageMeta - ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "ImageMeta", true); + // ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "ImageMeta", true); psfFwhm = (fwhmMaj+fwhmMin)/2; momentFwhm = (momentMaj+momentMin)/2; imageFlags = (uint64_t)pImage->flags; - fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &pImage->photcode, &status); - fits_write_col(this->fitsOut, TBYTE, IMAGEMETA_FILTERID, 1, 1, 1, &filterID, &status); - fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOSCAT, 1, 1, 1, &zptObs, &status); - fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PSFFWHM, 1, 1, 1, &psfFwhm, &status); - fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOZERO, 1, 1, 1, &zptObs, &status); - fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_QAFLAGS, 1, 1, 1, &imageFlags, &status); + // fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &pImage->photcode, &status); + // fits_write_col(this->fitsOut, TBYTE, IMAGEMETA_FILTERID, 1, 1, 1, &filterID, &status); + // fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOSCAT, 1, 1, 1, &zptObs, &status); + // fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PSFFWHM, 1, 1, 1, &psfFwhm, &status); + // fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOZERO, 1, 1, 1, &zptObs, &status); + // fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_QAFLAGS, 1, 1, 1, &imageFlags, &status); // now move BACK to detections table in smf @@ -287,9 +285,9 @@ obsTimes[s] = obsTime; - ippToPsps_getFlux(zeroPoint, exposureTime, instMagErr[s], &instFluxErr[s]); + peakFluxOk = ippToPsps_getFlux(exposureTime, peakMag[s], &peakFlux[s], 0.0, NULL); + instFluxOk = ippToPsps_getFlux(exposureTime, instMag[s], &instFlux[s], instMagErr[s], &instFluxErr[s]); // check for invalid flux values (if not already labelled as a duplicate) - if ((!ippToPsps_getFlux(zeroPoint, exposureTime, peakMag[s], &peakFlux[s]) || - !ippToPsps_getFlux(zeroPoint, exposureTime, instMag[s], &instFlux[s])) && !isDuplicate) { + if ( (!peakFluxOk || !instFluxOk) && !isDuplicate) { removeList[numOfDuplicates+numInvalidFlux] = s+1; numInvalidFlux++; @@ -314,5 +312,5 @@ // write number of rows (detections) to ImageMeta numDetectionsOut = totalDetections - numOfDuplicates - numInvalidFlux; - fits_write_col(this->fitsOut, TLONG, IMAGEMETA_NDETECT, 1, 1, 1, &numDetectionsOut, &status); + // fits_write_col(this->fitsOut, TLONG, IMAGEMETA_NDETECT, 1, 1, 1, &numDetectionsOut, &status); // detections @@ -323,7 +321,8 @@ fits_write_col(this->fitsOut, TLONGLONG, DETECTION_IPPDETECTID, 1, 1, nDet, ippDetectID, &status); fits_write_col(this->fitsOut, TBYTE, DETECTION_FILTERID, 1, 1, nDet, filterIDs, &status); + fits_write_col(this->fitsOut, TLONGLONG, DETECTION_IMAGEID, 1, 1, nDet, imageID, &status); fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUX, 1, 1, nDet, instFlux, &status); - fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUXERR, 1, 1, nDet, instFluxErr, &status); - fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKADU, 1, 1, nDet, peakFlux, &status); + //fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUXERR, 1, 1, nDet, instFluxErr, &status); + //fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKADU, 1, 1, nDet, peakFlux, &status); fits_write_col(this->fitsOut, TLONGLONG, DETECTION_INFOFLAG, 1, 1, nDet, flags, &status); if (numOfDuplicates||numInvalidFlux) fits_delete_rowlist(this->fitsOut, removeList, numOfDuplicates+numInvalidFlux, &status); @@ -346,8 +345,8 @@ // write number of images we have found into FrameMeta table status=0; - if (fits_movnam_hdu(this->fitsOut, BINARY_TBL, "FrameMeta", 0, &status)) - psError(PS_ERR_IO, false, "Can't move back to FrameMeta extension to write number of OTAs\n"); - else - fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_NOTA, 1, 1, 1, &nOta, &status); + //if (fits_movnam_hdu(this->fitsOut, BINARY_TBL, "FrameMeta", 0, &status)) + // psError(PS_ERR_IO, false, "Can't move back to FrameMeta extension to write number of OTAs\n"); + //else + // fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_NOTA, 1, 1, 1, &nOta, &status); status=0; Index: trunk/ippToPsps/src/ippToPspsTestEnums.h =================================================================== --- trunk/ippToPsps/src/ippToPspsTestEnums.h (revision 28758) +++ trunk/ippToPsps/src/ippToPspsTestEnums.h (revision 28759) @@ -3,89 +3,4 @@ -typedef enum { - FRAMEMETA_FRAMEID = 1, - FRAMEMETA_FILTERID, - FRAMEMETA_NOTA, - FRAMEMETA_PHOTOSCAT, - FRAMEMETA_EXPSTART, - FRAMEMETA_EXPTIME, - FRAMEMETA_AIRMASS, - FRAMEMETA_RABORE, - FRAMEMETA_DECBORE, - FRAMEMETA_CTYPE1, - FRAMEMETA_CTYPE2, - FRAMEMETA_CRVAL1, - FRAMEMETA_CRVAL2, - FRAMEMETA_CRPIX1, - FRAMEMETA_CRPIX2, - FRAMEMETA_PC001001, - FRAMEMETA_PC001002, - FRAMEMETA_PC002001, - FRAMEMETA_PC002002, - FRAMEMETA_POLYORDER, - FRAMEMETA_PCA1X3Y0, - FRAMEMETA_PCA1X2Y1, - FRAMEMETA_PCA1X1Y2, - FRAMEMETA_PCA1X0Y3, - FRAMEMETA_PCA1X2Y0, - FRAMEMETA_PCA1X1Y1, - FRAMEMETA_PCA1X0Y2, - FRAMEMETA_PCA2X3Y0, - FRAMEMETA_PCA2X2Y1, - FRAMEMETA_PCA2X1Y2, - FRAMEMETA_PCA2X0Y3, - FRAMEMETA_PCA2X2Y0, - FRAMEMETA_PCA2X1Y1, - FRAMEMETA_PCA2X0Y2, -} FrameMeta; - -typedef enum { - IMAGEMETA_PHOTOCALID = 1, - IMAGEMETA_FILTERID, - IMAGEMETA_SKY, - IMAGEMETA_SKYSCAT, - IMAGEMETA_NDETECT, - IMAGEMETA_MAGSAT, - IMAGEMETA_COMPLETMAG, - IMAGEMETA_ASTROSCAT, - IMAGEMETA_PHOTOSCAT, - IMAGEMETA_NUMASTROREF, - IMAGEMETA_NX, - IMAGEMETA_NY, - IMAGEMETA_PSFMODELID, - IMAGEMETA_PSFFWHM, - IMAGEMETA_PSFWIDMAJOR, - IMAGEMETA_PSFWIDMINOR, - IMAGEMETA_PSFTHETA, - IMAGEMETA_APRESID, - IMAGEMETA_DAPRESID, - IMAGEMETA_PHOTOZERO, - IMAGEMETA_QAFLAGS, - IMAGEMETA_CTYPE1, - IMAGEMETA_CTYPE2, - IMAGEMETA_CRVAL1, - IMAGEMETA_CRVAL2, - IMAGEMETA_CRPIX1, - IMAGEMETA_CRPIX2, - IMAGEMETA_PC001001, - IMAGEMETA_PC001002, - IMAGEMETA_PC002001, - IMAGEMETA_PC002002, - IMAGEMETA_POLYORDER, - IMAGEMETA_PCA1X3Y0, - IMAGEMETA_PCA1X2Y1, - IMAGEMETA_PCA1X1Y2, - IMAGEMETA_PCA1X0Y3, - IMAGEMETA_PCA1X2Y0, - IMAGEMETA_PCA1X1Y1, - IMAGEMETA_PCA1X0Y2, - IMAGEMETA_PCA2X3Y0, - IMAGEMETA_PCA2X2Y1, - IMAGEMETA_PCA2X1Y2, - IMAGEMETA_PCA2X0Y3, - IMAGEMETA_PCA2X2Y0, - IMAGEMETA_PCA2X1Y1, - IMAGEMETA_PCA2X0Y2, -} ImageMeta; typedef enum { @@ -95,20 +10,9 @@ DETECTION_IPPDETECTID, DETECTION_FILTERID, - DETECTION_XPOS, - DETECTION_YPOS, - DETECTION_XPOSERR, - DETECTION_YPOSERR, - DETECTION_IPPRA , - DETECTION_IPPDEC , + DETECTION_IMAGEID, + DETECTION_RA , + DETECTION_DEC , + DETECTION_INFOFLAG, DETECTION_INSTFLUX, - DETECTION_INSTFLUXERR, - DETECTION_PEAKADU, - DETECTION_PSFWIDMAJOR, - DETECTION_PSFWIDMINOR, - DETECTION_PSFTHETA, - DETECTION_PSFCF, - DETECTION_INFOFLAG, - DETECTION_SKY, - DETECTION_SKYERR, } Detection;