Index: trunk/psModules/src/imcombine/pmSubtractionAnalysis.c =================================================================== --- trunk/psModules/src/imcombine/pmSubtractionAnalysis.c (revision 25046) +++ trunk/psModules/src/imcombine/pmSubtractionAnalysis.c (revision 25060) @@ -17,10 +17,10 @@ -bool pmSubtractionAnalysis(psMetadata *analysis, pmSubtractionKernels *kernels, psRegion *region, +bool pmSubtractionAnalysis(psMetadata *analysis, psMetadata *header, + pmSubtractionKernels *kernels, psRegion *region, int numCols, int numRows) { - if (analysis) { - PS_ASSERT_METADATA_NON_NULL(analysis, false); - } + PS_ASSERT_METADATA_NON_NULL(analysis, false); + PS_ASSERT_METADATA_NON_NULL(header, false); PM_ASSERT_SUBTRACTION_KERNELS_NON_NULL(kernels, false); PM_ASSERT_SUBTRACTION_KERNELS_SOLUTION(kernels, false); @@ -38,5 +38,12 @@ PS_DATA_REGION | PS_META_DUPLICATE_OK, "Region over which subtraction was performed", subRegion); + + psString string = psRegionToString(*subRegion); psFree(subRegion); + + psMetadataAddPtr(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_REGION, + PS_DATA_REGION | PS_META_DUPLICATE_OK, + "Region over which subtraction was performed", string); + psFree(string); } @@ -45,5 +52,7 @@ PS_DATA_UNKNOWN | PS_META_DUPLICATE_OK, "Subtraction kernels", kernels); psMetadataAddS32(analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MODE, - PS_META_DUPLICATE_OK, "Subtraction kernels", kernels->mode); + PS_META_DUPLICATE_OK, "Subtraction mode", kernels->mode); + psMetadataAddS32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MODE, + PS_META_DUPLICATE_OK, "Subtraction mode", kernels->mode); // Realisations of kernel @@ -163,10 +172,22 @@ psFree(image); - psMetadataItem *item = psMetadataLookup(analysis, PM_SUBTRACTION_ANALYSIS_DECONV_MAX); // Previous - if (item) { - item->data.F32 = PS_MAX(item->data.F32, max); - } else { - psMetadataAddF32(analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_DECONV_MAX, 0, - "Maximum deconvolution fraction", max); + { + psMetadataItem *item = psMetadataLookup(analysis, PM_SUBTRACTION_ANALYSIS_DECONV_MAX); // Previous + if (item) { + max = item->data.F32 = PS_MAX(item->data.F32, max); + } else { + psMetadataAddF32(analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_DECONV_MAX, 0, + "Maximum deconvolution fraction", max); + } + } + + { + psMetadataItem *item = psMetadataLookup(header, PM_SUBTRACTION_ANALYSIS_DECONV_MAX); // Previous + if (item) { + item->data.F32 = max; + } else { + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_DECONV_MAX, 0, + "Maximum deconvolution fraction", max); + } } } @@ -216,4 +237,17 @@ psMetadataAddF32(analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MYY, PS_META_DUPLICATE_OK, "Moment in yy", m02); + + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_NORM, + PS_META_DUPLICATE_OK, "Normalisation", m00); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MX, + PS_META_DUPLICATE_OK, "Moment in x", m10); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MY, + PS_META_DUPLICATE_OK, "Moment in y", m01); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MXX, + PS_META_DUPLICATE_OK, "Moment in xx", m20); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MXY, + PS_META_DUPLICATE_OK, "Moment in xy", m11); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_MYY, + PS_META_DUPLICATE_OK, "Moment in yy", m02); } @@ -225,4 +259,6 @@ psMetadataAddF32(analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_BGDIFF, + PS_META_DUPLICATE_OK, "Background difference", bg); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_BGDIFF, PS_META_DUPLICATE_OK, "Background difference", bg); psFree(polyValues); @@ -237,4 +273,11 @@ psMetadataAddF32(analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_DEV_RMS, 0, "RMS stamp deviation", kernels->rms); + + psMetadataAddS32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_STAMPS, 0, "Number of stamps", + kernels->numStamps); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_DEV_MEAN, 0, "Mean stamp deviation", + kernels->mean); + psMetadataAddF32(header, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_DEV_RMS, 0, "RMS stamp deviation", + kernels->rms); } Index: trunk/psModules/src/imcombine/pmSubtractionAnalysis.h =================================================================== --- trunk/psModules/src/imcombine/pmSubtractionAnalysis.h (revision 25046) +++ trunk/psModules/src/imcombine/pmSubtractionAnalysis.h (revision 25060) @@ -27,4 +27,5 @@ bool pmSubtractionAnalysis( psMetadata *analysis, ///< Metadata container for QA information + psMetadata *header, ///< Metadata container for QA information to put in header pmSubtractionKernels *kernels, ///< Kernels psRegion *region, ///< Region for subtraction Index: trunk/psModules/src/imcombine/pmSubtractionMatch.c =================================================================== --- trunk/psModules/src/imcombine/pmSubtractionMatch.c (revision 25046) +++ trunk/psModules/src/imcombine/pmSubtractionMatch.c (revision 25060) @@ -10,4 +10,5 @@ #include "pmHDU.h" #include "pmFPA.h" +#include "pmHDUUtils.h" #include "pmSubtractionParams.h" #include "pmSubtractionKernels.h" @@ -58,16 +59,16 @@ -static bool getStamps(pmSubtractionStampList **stamps, // Stamps to read - const pmReadout *ro1, // Readout 1 - const pmReadout *ro2, // Readout 2 - const psImage *subMask, // Mask for subtraction, or NULL - psImage *variance, // Variance map - const psRegion *region, // Region of interest, or NULL - float thresh1, // Threshold for stamp finding on readout 1 - float thresh2, // Threshold for stamp finding on readout 2 - float stampSpacing, // Spacing between stamps - int size, // Kernel half-size - int footprint, // Convolution footprint for stamps - pmSubtractionMode mode // Mode for subtraction +static bool subtractionGetStamps(pmSubtractionStampList **stamps, // Stamps to read + const pmReadout *ro1, // Readout 1 + const pmReadout *ro2, // Readout 2 + const psImage *subMask, // Mask for subtraction, or NULL + psImage *variance, // Variance map + const psRegion *region, // Region of interest, or NULL + float thresh1, // Threshold for stamp finding on readout 1 + float thresh2, // Threshold for stamp finding on readout 2 + float stampSpacing, // Spacing between stamps + int size, // Kernel half-size + int footprint, // Convolution footprint for stamps + pmSubtractionMode mode // Mode for subtraction ) { @@ -163,4 +164,31 @@ } +static void subtractionAnalysisUpdate(pmReadout *conv1, pmReadout *conv2, // Convolved images + const psMetadata *analysis, // Analysis metadata + const psMetadata *header // Header metadata + ) +{ + if (conv1) { + conv1->analysis = psMetadataCopy(conv1->analysis, analysis); + } + if (conv2) { + conv2->analysis = psMetadataCopy(conv2->analysis, analysis); + } + + if (conv1 && conv1->parent) { + pmHDU *hdu = pmHDUFromCell(conv1->parent); + if (hdu) { + hdu->header = psMetadataCopy(hdu->header, header); + } + } + if (conv2 && conv2->parent) { + pmHDU *hdu = pmHDUFromCell(conv2->parent); + if (hdu) { + hdu->header = psMetadataCopy(hdu->header, header); + } + } + + return; +} @@ -253,4 +281,5 @@ psMetadata *outAnalysis = psMetadataAlloc(); // Output analysis values + psMetadata *outHeader = psMetadataAlloc(); // Output header values psTrace("psModules.imcombine", 2, "Convolving...\n"); @@ -259,7 +288,9 @@ psRegion *region = regions->data[i]; // Region of interest - if (!pmSubtractionAnalysis(outAnalysis, kernel, region, ro1->image->numCols, ro1->image->numRows)) { + if (!pmSubtractionAnalysis(outAnalysis, outHeader, kernel, region, + ro1->image->numCols, ro1->image->numRows)) { psError(PS_ERR_UNKNOWN, false, "Unable to generate QA data"); psFree(outAnalysis); + psFree(outHeader); psFree(subMask); psFree(kernels); @@ -272,4 +303,5 @@ psError(PS_ERR_UNKNOWN, false, "Unable to convolve image."); psFree(outAnalysis); + psFree(outHeader); psFree(subMask); psFree(kernels); @@ -283,11 +315,7 @@ psFree(regions); - if (conv1) { - psMetadataCopy(conv1->analysis, outAnalysis); - } - if (conv2) { - psMetadataCopy(conv2->analysis, outAnalysis); - } + subtractionAnalysisUpdate(conv1, conv2, outAnalysis, outHeader); psFree(outAnalysis); + psFree(outHeader); return true; @@ -369,4 +397,5 @@ pmSubtractionKernels *kernels = NULL; // Kernel basis functions psMetadata *analysis = psMetadataAlloc(); // QA data + psMetadata *header = psMetadataAlloc(); // QA data for header int numCols = ro1->image->numCols, numRows = ro1->image->numRows; // Image dimensions @@ -442,5 +471,5 @@ // We get the stamps here; we will also attempt to get stamps at the first iteration, but it // doesn't matter. - if (!getStamps(&stamps, ro1, ro2, subMask, variance, NULL, stampThresh1, stampThresh2, + if (!subtractionGetStamps(&stamps, ro1, ro2, subMask, variance, NULL, stampThresh1, stampThresh2, stampSpacing, size, footprint, subMode)) { goto MATCH_ERROR; @@ -504,6 +533,7 @@ psLogMsg("psModules.imcombine", PS_LOG_INFO, "Iteration %d.", k); - if (!getStamps(&stamps, ro1, ro2, subMask, variance, region, stampThresh1, stampThresh2, - stampSpacing, size, footprint, subMode)) { + if (!subtractionGetStamps(&stamps, ro1, ro2, subMask, variance, region, + stampThresh1, stampThresh2, stampSpacing, + size, footprint, subMode)) { goto MATCH_ERROR; } @@ -565,5 +595,5 @@ memCheck("solution"); - if (!pmSubtractionAnalysis(analysis, kernels, region, numCols, numRows)) { + if (!pmSubtractionAnalysis(analysis, header, kernels, region, numCols, numRows)) { psError(PS_ERR_UNKNOWN, false, "Unable to generate QA data"); goto MATCH_ERROR; @@ -601,11 +631,7 @@ memCheck("convolution"); - if (conv1) { - psMetadataCopy(conv1->analysis, analysis); - } - if (conv2) { - psMetadataCopy(conv2->analysis, analysis); - } + subtractionAnalysisUpdate(conv1, conv2, analysis, header); psFree(analysis); + psFree(header); #ifdef TESTING @@ -629,4 +655,5 @@ MATCH_ERROR: psFree(analysis); + psFree(header); psFree(region); psFree(regionString);