Changeset 30624 for trunk/psphot/src/psphotStackMatchPSFsUtils.c

Timestamp:

Feb 13, 2011, 12:33:05 PM (15 years ago)

Author:

eugene

Message:

adding some of the metadata needed by PSPS to output headers; skip models with few valid pixels (eg, only the edge is showing); only do the linear fit on pixels within the fit radius; modify psf-match auto-scaling process; enable multiple target psfs for matched-psf aperture photometry; speed up analysis of the radial apertures

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotStackMatchPSFsUtils.c (modified) (2 diffs)

trunk/psphot/src/psphotStackMatchPSFsUtils.c

@@ -365 +365 @@
         pmSubtractionSetFWHMs(options->inputSeeing->data.F32[index], options->targetSeeing);
 
-        if (scale && !pmSubtractionParamsScale(&size, &footprint, widthsCopy, scaleRef, scaleMin, scaleMax)) {
-            psError(psErrorCodeLast(), false, "Unable to scale kernel parameters");
-            goto escape;
-        }
+        pmSubtractionParamScaleOptions(scale, scaleRef, scaleMin, scaleMax);
+
+        // if (scale && !pmSubtractionParamsScale(&size, &footprint, widthsCopy, scaleRef, scaleMin, scaleMax)) {
+        //     psError(psErrorCodeLast(), false, "Unable to scale kernel parameters");
+        //     goto escape;
+        // }
 
         if (!pmSubtractionMatch(NULL, readoutOut, fake, readoutSrc, footprint, stride, regionSize, spacing, threshold, stampSources, stampsName, type, size, order, widthsCopy, orders, inner, ringsOrder, binning, penalty, optimum, optWidths, optOrder, optThresh, iter, rej, normFrac, sysError, skyErr, kernelError, covarFrac, maskVal, maskBad, maskPoor, poorFrac, badFrac, PM_SUBTRACTION_MODE_2)) {
@@ -383 +385 @@
         goto escape;
     }
+
+    // save the PSF on the new readout->analysis:
+    // if (!psMetadataAddPtr (readoutOut->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot psf model", options->psf)) {
+    //     psError (PSPHOT_ERR_UNKNOWN, false, "problem saving sources on readout");
+    //     return false;
+    // }
 
     // dumpImage(readoutOut, readoutSrc, index, "conv");