Index: /trunk/ppSub/src/ppSubCamera.c =================================================================== --- /trunk/ppSub/src/ppSubCamera.c (revision 21373) +++ /trunk/ppSub/src/ppSubCamera.c (revision 21374) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-06 01:37:17 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-06 03:20:02 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ @@ -39,12 +39,12 @@ } - // Input weight map - pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.WEIGHT", "INPUT.WEIGHT"); - if (!status) { - psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.INPUT.WEIGHT"); + // Input variance map + pmFPAfile *inputVariance = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.VARIANCE", "INPUT.VARIANCE"); + if (!status) { + psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.INPUT.VARIANCE"); return NULL; } - if (inputWeight && inputWeight->type != PM_FPA_FILE_WEIGHT) { - psError(PS_ERR_IO, true, "PPSUB.INPUT.WEIGHT is not of type WEIGHT"); + if (inputVariance && inputVariance->type != PM_FPA_FILE_VARIANCE) { + psError(PS_ERR_IO, true, "PPSUB.INPUT.VARIANCE is not of type VARIANCE"); return false; } @@ -73,12 +73,12 @@ } - // Reference weight map - pmFPAfile *refWeight = pmFPAfileBindFromArgs(&status, ref, config, "PPSUB.REF.WEIGHT", "REF.WEIGHT"); - if (!status) { - psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.REF.WEIGHT"); + // Reference variance map + pmFPAfile *refVariance = pmFPAfileBindFromArgs(&status, ref, config, "PPSUB.REF.VARIANCE", "REF.VARIANCE"); + if (!status) { + psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.REF.VARIANCE"); return NULL; } - if (refWeight && refWeight->type != PM_FPA_FILE_WEIGHT) { - psError(PS_ERR_IO, true, "PPSUB.REF.WEIGHT is not of type WEIGHT"); + if (refVariance && refVariance->type != PM_FPA_FILE_VARIANCE) { + psError(PS_ERR_IO, true, "PPSUB.REF.VARIANCE is not of type VARIANCE"); return false; } @@ -108,16 +108,16 @@ outMask->save = true; - // Output weight - if (inputWeight && refWeight) { - pmFPAfile *outWeight = pmFPAfileDefineOutput(config, output->fpa, "PPSUB.OUTPUT.WEIGHT"); - if (!outWeight) { - psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.WEIGHT")); - return false; - } - if (outWeight->type != PM_FPA_FILE_WEIGHT) { - psError(PS_ERR_IO, true, "PPSUB.OUTPUT.WEIGHT is not of type WEIGHT"); - return false; - } - outWeight->save = true; + // Output variance + if (inputVariance && refVariance) { + pmFPAfile *outVariance = pmFPAfileDefineOutput(config, output->fpa, "PPSUB.OUTPUT.VARIANCE"); + if (!outVariance) { + psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.VARIANCE")); + return false; + } + if (outVariance->type != PM_FPA_FILE_VARIANCE) { + psError(PS_ERR_IO, true, "PPSUB.OUTPUT.VARIANCE is not of type VARIANCE"); + return false; + } + outVariance->save = true; } @@ -146,16 +146,16 @@ // XXX should be based on recipe : inConvMask->save = true; - // Convolved input weight - if (inputWeight) { - pmFPAfile *inConvWeight = pmFPAfileDefineOutput(config, inConv->fpa, "PPSUB.INPUT.CONV.WEIGHT"); - if (!inConvWeight) { - psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.WEIGHT")); - return false; - } - if (inConvWeight->type != PM_FPA_FILE_WEIGHT) { - psError(PS_ERR_IO, true, "PPSUB.INPUT.CONV.WEIGHT is not of type WEIGHT"); - return false; - } - // XXX should be based on recipe : inConvWeight->save = true; + // Convolved input variance + if (inputVariance) { + pmFPAfile *inConvVariance = pmFPAfileDefineOutput(config, inConv->fpa, "PPSUB.INPUT.CONV.VARIANCE"); + if (!inConvVariance) { + psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.VARIANCE")); + return false; + } + if (inConvVariance->type != PM_FPA_FILE_VARIANCE) { + psError(PS_ERR_IO, true, "PPSUB.INPUT.CONV.VARIANCE is not of type VARIANCE"); + return false; + } + // XXX should be based on recipe : inConvVariance->save = true; } @@ -184,16 +184,16 @@ // XXX should be based on recipe : refConvMask->save = true; - // Convolved ref weight - if (refWeight) { - pmFPAfile *refConvWeight = pmFPAfileDefineOutput(config, refConv->fpa, "PPSUB.REF.CONV.WEIGHT"); - if (!refConvWeight) { - psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.WEIGHT")); - return false; - } - if (refConvWeight->type != PM_FPA_FILE_WEIGHT) { - psError(PS_ERR_IO, true, "PPSUB.REF.CONV.WEIGHT is not of type WEIGHT"); - return false; - } - // XXX should be based on recipe : refConvWeight->save = true; + // Convolved ref variance + if (refVariance) { + pmFPAfile *refConvVariance = pmFPAfileDefineOutput(config, refConv->fpa, "PPSUB.REF.CONV.VARIANCE"); + if (!refConvVariance) { + psError(PS_ERR_IO, false, _("Unable to generate output file from PPSUB.OUTPUT.VARIANCE")); + return false; + } + if (refConvVariance->type != PM_FPA_FILE_VARIANCE) { + psError(PS_ERR_IO, true, "PPSUB.REF.CONV.VARIANCE is not of type VARIANCE"); + return false; + } + // XXX should be based on recipe : refConvVariance->save = true; } Index: /trunk/ppSub/src/ppSubReadoutPhotometry.c =================================================================== --- /trunk/ppSub/src/ppSubReadoutPhotometry.c (revision 21373) +++ /trunk/ppSub/src/ppSubReadoutPhotometry.c (revision 21374) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-06 01:37:17 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-06 03:20:02 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ @@ -25,7 +25,7 @@ if (!psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) { - pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL"); - pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL.STDEV"); - return true; + pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL"); + pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL.STDEV"); + return true; } @@ -40,6 +40,6 @@ pmPSF *psf = psMetadataLookupPtr(NULL, psfInputChip->analysis, "PSPHOT.PSF"); if (!psf) { - psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find PSF from psphot"); - return false; + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find PSF from psphot"); + return false; } psMetadataAddPtr(psfLoadChip->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN | PS_META_REPLACE, "PSF from matched addition", psf); @@ -55,19 +55,19 @@ pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout with the sources if (!photRO) { - pmCell *cell = pmFPAfileThisCell(config->files, view, "PSPHOT.RESID"); // Output cell - photRO = pmReadoutAlloc(cell); // Output readout: subtraction + pmCell *cell = pmFPAfileThisCell(config->files, view, "PSPHOT.RESID"); // Output cell + photRO = pmReadoutAlloc(cell); // Output readout: subtraction } photRO->image = psImageCopy(photRO->image, outRO->image, PS_TYPE_F32); - if (outRO->weight) { - photRO->weight = psImageCopy(photRO->weight, outRO->weight, PS_TYPE_F32); + if (outRO->variance) { + photRO->variance = psImageCopy(photRO->variance, outRO->variance, PS_TYPE_F32); } else { - psFree (photRO->weight); - photRO->weight = NULL; + psFree (photRO->variance); + photRO->variance = NULL; } if (outRO->mask) { - photRO->mask = psImageCopy(photRO->mask, outRO->mask, PS_TYPE_IMAGE_MASK); + photRO->mask = psImageCopy(photRO->mask, outRO->mask, PS_TYPE_IMAGE_MASK); } else { - psFree (photRO->mask); - photRO->mask = NULL; + psFree (photRO->mask); + photRO->mask = NULL; } @@ -77,20 +77,20 @@ // old-style variance renormalization if (!ppSubReadoutRenormPhot (config, recipe, photRO)) { - psError(PS_ERR_UNKNOWN, false, "failure in renormalization"); - return false; + psError(PS_ERR_UNKNOWN, false, "failure in renormalization"); + return false; } if (!psphotReadoutMinimal(config, view)) { - psWarning("Unable to perform photometry on subtracted image."); - psErrorStackPrint(stderr, "Error stack from photometry:"); - psErrorClear(); + psWarning("Unable to perform photometry on subtracted image."); + psErrorStackPrint(stderr, "Error stack from photometry:"); + psErrorClear(); } if (stats) { - psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources - psMetadataAddS32(stats, PS_LIST_TAIL, "NUM_SOURCES", 0, "Number of sources detected", - sources ? sources->n : 0); - psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_PHOT", 0, "Time to do photometry", - psTimerClear("PPSUB_PHOT")); + psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources + psMetadataAddS32(stats, PS_LIST_TAIL, "NUM_SOURCES", 0, "Number of sources detected", + sources ? sources->n : 0); + psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_PHOT", 0, "Time to do photometry", + psTimerClear("PPSUB_PHOT")); } @@ -103,8 +103,8 @@ // XXX not sure that this is still needed (only if psphotReadoutMinimal measures the background) // if (!pmFPAfileDropInternal(config->files, "PSPHOT.BACKMDL") || - // !pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV") || - // !pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND")) { - // psError(PS_ERR_UNKNOWN, false, "Unable to drop PSPHOT internal files."); - // return false; + // !pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL.STDEV") || + // !pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND")) { + // psError(PS_ERR_UNKNOWN, false, "Unable to drop PSPHOT internal files."); + // return false; // } @@ -116,44 +116,44 @@ // Record data about sources: not everything gets into the output CMF files { - pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout with the sources - psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources - FILE *sourceFile = fopen("sources.dat", "w"); // File for sources - fprintf(sourceFile, - "# x y mag mag_err psf_chisq cr_nsigma ext_nsigma psf_qf flags m_x m_y m_xx m_xy m_yy\n"); - for (int i = 0; i < sources->n; i++) { - pmSource *source = sources->data[i]; - if (!source) { - continue; - } + pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout with the sources + psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources + FILE *sourceFile = fopen("sources.dat", "w"); // File for sources + fprintf(sourceFile, + "# x y mag mag_err psf_chisq cr_nsigma ext_nsigma psf_qf flags m_x m_y m_xx m_xy m_yy\n"); + for (int i = 0; i < sources->n; i++) { + pmSource *source = sources->data[i]; + if (!source) { + continue; + } - float x, y; // Position of source - float chi2; // chi^2 for source - if (source->modelPSF) { - x = source->modelPSF->params->data.F32[PM_PAR_XPOS]; - y = source->modelPSF->params->data.F32[PM_PAR_YPOS]; - chi2 = source->modelPSF->chisq; - } else if (source->peak) { - x = source->peak->xf; - y = source->peak->yf; - chi2 = NAN; - } else { - psWarning("No position available for source."); - continue; - } + float x, y; // Position of source + float chi2; // chi^2 for source + if (source->modelPSF) { + x = source->modelPSF->params->data.F32[PM_PAR_XPOS]; + y = source->modelPSF->params->data.F32[PM_PAR_YPOS]; + chi2 = source->modelPSF->chisq; + } else if (source->peak) { + x = source->peak->xf; + y = source->peak->yf; + chi2 = NAN; + } else { + psWarning("No position available for source."); + continue; + } - float xMoment = NAN, yMoment = NAN, xxMoment = NAN, xyMoment = NAN, yyMoment = NAN; - if (source->moments) { - xMoment = source->moments->Mx; - yMoment = source->moments->My; - xxMoment = source->moments->Mxx; - xyMoment = source->moments->Mxy; - yyMoment = source->moments->Myy; - } + float xMoment = NAN, yMoment = NAN, xxMoment = NAN, xyMoment = NAN, yyMoment = NAN; + if (source->moments) { + xMoment = source->moments->Mx; + yMoment = source->moments->My; + xxMoment = source->moments->Mxx; + xyMoment = source->moments->Mxy; + yyMoment = source->moments->Myy; + } - fprintf(sourceFile, "%f %f %f %f %f %f %f %f %d %f %f %f %f %f\n", - x, y, source->psfMag, source->errMag, chi2, source->crNsigma, source->extNsigma, - source->pixWeight, source->mode, xMoment, yMoment, xxMoment, xyMoment, yyMoment); - } - fclose(sourceFile); + fprintf(sourceFile, "%f %f %f %f %f %f %f %f %d %f %f %f %f %f\n", + x, y, source->psfMag, source->errMag, chi2, source->crNsigma, source->extNsigma, + source->pixWeight, source->mode, xMoment, yMoment, xxMoment, xyMoment, yyMoment); + } + fclose(sourceFile); } #endif Index: /trunk/ppSub/src/ppSubReadoutRenorm.c =================================================================== --- /trunk/ppSub/src/ppSubReadoutRenorm.c (revision 21373) +++ /trunk/ppSub/src/ppSubReadoutRenorm.c (revision 21374) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-06 01:37:17 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-06 03:20:02 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ @@ -23,12 +23,12 @@ psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe, "RENORM.STDEV")); if (renormMean == PS_STAT_NONE || renormStdev == PS_STAT_NONE) { - psError(PS_ERR_BAD_PARAMETER_VALUE, false, - "Unable to parse renormalisation statistics from recipe."); - return false; + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse renormalisation statistics from recipe."); + return false; } psImageMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask - if (!pmReadoutWeightRenormPixels(readout, maskValue, renormMean, renormStdev, NULL)) { - psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances."); - return false; + if (!pmReadoutVarianceRenormPixels(readout, maskValue, renormMean, renormStdev, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances."); + return false; } return true; @@ -48,7 +48,7 @@ psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe, "RENORM.STDEV")); if (renormMean == PS_STAT_NONE || renormStdev == PS_STAT_NONE) { - psError(PS_ERR_BAD_PARAMETER_VALUE, false, - "Unable to parse renormalisation statistics from recipe."); - return false; + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse renormalisation statistics from recipe."); + return false; } @@ -58,7 +58,7 @@ psImageMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask - if (!pmReadoutWeightRenormPhot(readout, maskValue, renormNum, renormWidth, renormMean, renormStdev, NULL)) { - psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances."); - return false; + if (!pmReadoutVarianceRenormPhot(readout, maskValue, renormNum, renormWidth, renormMean, renormStdev, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances."); + return false; } return true; Index: /trunk/ppSub/src/ppSubReadoutSubtract.c =================================================================== --- /trunk/ppSub/src/ppSubReadoutSubtract.c (revision 21373) +++ /trunk/ppSub/src/ppSubReadoutSubtract.c (revision 21374) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-06 01:37:17 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-06 03:20:02 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ @@ -28,9 +28,9 @@ pmReadout *subtrahend = NULL; if (reverse) { - minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); - subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV"); + minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); + subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV"); } else { - minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV"); - subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); + minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV"); + subtrahend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); } @@ -53,9 +53,9 @@ // Do the actual subtraction pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT"); - outRO->image = (psImage *) psBinaryOp(outRO->image, minuend->image, "-", subtrahend->image); - if (minuend->weight && subtrahend->weight) { - outRO->weight = (psImage *) psBinaryOp(outRO->weight, minuend->weight, "+", subtrahend->weight); + outRO->image = (psImage*)psBinaryOp(outRO->image, minuend->image, "-", subtrahend->image); + if (minuend->variance && subtrahend->variance) { + outRO->variance = (psImage*)psBinaryOp(outRO->variance, minuend->variance, "+", subtrahend->variance); } - outRO->mask = (psImage *) psBinaryOp(outRO->mask, minuend->mask, "|", subtrahend->mask); + outRO->mask = (psImage*)psBinaryOp(outRO->mask, minuend->mask, "|", subtrahend->mask); outRO->data_exists = true; @@ -83,6 +83,6 @@ if (!outHDU || !inHDU) { psError(PS_ERR_UNKNOWN, false, "Unable to find HDU at FPA level to copy astrometry."); - return false; - } + return false; + } // Copy astrometry over @@ -90,10 +90,10 @@ if (!pmAstromReadWCS(outFPA, outChip, inHDU->header, 1.0)) { psError(PS_ERR_UNKNOWN, false, "Unable to read WCS astrometry from input FPA."); - return false; - } + return false; + } if (!pmAstromWriteWCS(outHDU->header, outFPA, outChip, WCS_TOLERANCE)) { psError(PS_ERR_UNKNOWN, false, "Unable to write WCS astrometry to output FPA."); - return false; + return false; } Index: /trunk/ppSub/src/ppSubVarianceFactors.c =================================================================== --- /trunk/ppSub/src/ppSubVarianceFactors.c (revision 21373) +++ /trunk/ppSub/src/ppSubVarianceFactors.c (revision 21374) @@ -6,6 +6,6 @@ * * @author IfA - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-06 01:37:17 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-06 03:20:02 $ * Copyright 2009 Institute for Astronomy, University of Hawaii */ @@ -40,26 +40,26 @@ pmSubtractionKernels *kernels = psMetadataLookupPtr(&mdok, outRO->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL); // Kernels if (!mdok) { - psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find subtraction kernels."); - return false; + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find subtraction kernels."); + return false; } float vfIn = psMetadataLookupF32(NULL, inCell->concepts, "CELL.VARFACTOR"); // Variance factor for input if (!isfinite(vfIn)) { - vfIn = 1.0; + vfIn = 1.0; } float vfRef = psMetadataLookupF32(NULL, refCell->concepts, "CELL.VARFACTOR"); // Variance factor for ref if (!isfinite(vfRef)) { - vfRef = 1.0; + vfRef = 1.0; } if (kernels->mode == PM_SUBTRACTION_MODE_1) { - vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false); + vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false); } if (kernels->mode == PM_SUBTRACTION_MODE_2) { - vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false); - } + vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false); + } if (kernels->mode == PM_SUBTRACTION_MODE_DUAL) { - vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false); - vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, true); + vfIn *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, false); + vfRef *= pmSubtractionVarianceFactor(kernels, 0.0, 0.0, true); } @@ -72,18 +72,18 @@ // measure the mean of the convolved input variance image - if (!psImageBackground(vfStats, NULL, inConv->weight, inConv->mask, maskVal | maskBad, rng)) { - psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved input"); - psFree(vfStats); - psFree(rng); - return false; + if (!psImageBackground(vfStats, NULL, inConv->variance, inConv->mask, maskVal | maskBad, rng)) { + psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved input"); + psFree(vfStats); + psFree(rng); + return false; } float inMeanVar = vfStats->robustMedian; // Mean variance of input // measure the mean of the convolved reference variance image - if (!psImageBackground(vfStats, NULL, refConv->weight, refConv->mask, maskVal | maskBad, rng)) { - psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved reference"); - psFree(vfStats); - psFree(rng); - return false; + if (!psImageBackground(vfStats, NULL, refConv->variance, refConv->mask, maskVal | maskBad, rng)) { + psError(PS_ERR_UNKNOWN, false, "Unable to measure mean variance for convolved reference"); + psFree(vfStats); + psFree(rng); + return false; } float refMeanVar = vfStats->robustMedian; // Mean variance of reference @@ -98,20 +98,20 @@ // Statistics on the matching if (stats) { - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MODE); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_MEAN); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_RMS); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_NORM); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_BGDIFF); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MX); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MY); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXX); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXY); - psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MYY); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MODE); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_MEAN); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_DEV_RMS); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_NORM); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_BGDIFF); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MX); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MY); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXX); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MXY); + psMetadataCopySingle(stats, outRO->analysis, PM_SUBTRACTION_ANALYSIS_MYY); - psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_MATCH", 0, "Time to match PSFs", - psTimerClear("PPSUB_MATCH")); + psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_MATCH", 0, "Time to match PSFs", + psTimerClear("PPSUB_MATCH")); } - + return true; }