Changeset 30631 for branches/czw_branch/20101203/psphot/src/psphotStackMatchPSFs.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotStackMatchPSFs.c (modified) (3 diffs)

branches/czw_branch/20101203/psphot/src/psphotStackMatchPSFs.c

@@ -65 +65 @@
 bool psphotStackMatchPSFsReadout (pmConfig *config, const pmFPAview *view, psphotStackOptions *options, int index) {
 
+    psImageMaskType maskValue;
+    psImageMaskType markValue;
+
+    // get the PSPHOT.MASK value from the config
+    if (!pmConfigMaskSetBits (&maskValue, &markValue, config)) {
+        psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values");
+        return false;
+    }
+
     pmFPAfile *fileSrc = psphotStackGetConvolveSource(config, options, index);
     if (!fileSrc) {
@@ -84 +93 @@
 
     // set NAN pixels to 'SAT'
-    // XXX replace this is pmReadoutMaskInvalid?
-    psImageMaskType maskVal = pmConfigMaskGet("SAT", config);
-    if (!pmReadoutMaskNonfinite(readoutSrc, maskVal)) {
+    psImageMaskType maskSat = pmConfigMaskGet("SAT", config);
+    if (!pmReadoutMaskInvalid(readoutSrc, maskValue, maskSat)) {
         psError(psErrorCodeLast(), false, "Unable to mask non-finite pixels in readout.");
         return false;
@@ -95 +103 @@
         matchKernel(config, readoutOut, readoutSrc, options, index);
         saveMatchData(readoutOut, options, index);
-        // renormKernel(readoutCnv, options, index);
-    } else {
-        // only match the flux (NO! not for multi-filter, at least!)
-        // XXX do not generate readoutCnv in this case?
-        // float norm = powf(10.0, -0.4 * options->norm->data.F32[index]); // Normalisation
-        // psBinaryOp(readoutRaw->image, readoutRaw->image, "*", psScalarAlloc(norm, PS_TYPE_F32));
-        // psBinaryOp(readoutRaw->variance, readoutRaw->variance, "*", psScalarAlloc(PS_SQR(norm), PS_TYPE_F32));
     }
-
     rescaleData(readoutOut, config, options, index);
 
-    // dumpImage(readoutOut, readoutSrc, index, "convolved");
+    // save the output fwhm values in the readout->analysis.  we may have / will have multiple output PSF sizes,
+    // so we save this in a vector.  if the vector is not yet defined, create it
+    bool mdok = false;
+    psVector *fwhmValues = psMetadataLookupVector(&mdok, readoutOut->analysis, "STACK.PSF.FWHM.VALUES");
+    if (!fwhmValues) {
+        fwhmValues = psVectorAllocEmpty(10, PS_TYPE_F32);
+        psMetadataAddVector(readoutOut->analysis, PS_LIST_TAIL, "STACK.PSF.FWHM.VALUES", PS_META_REPLACE, "PSF sizes", fwhmValues);
+        psFree(fwhmValues); // drops the extra copy
+    }
+    psVectorAppend(fwhmValues, options->targetSeeing);
 
     return true;
 }
-
-
-# if (0)
-// Read previously produced kernel
-if (psMetadataLookupBool(NULL, config->arguments, "PPSTACK.DEBUG.STACK")) {
-    loadKernel(config, readoutCnv, options, index);
-} else {
-    matchKernel(config, readoutCnv, readoutRaw, options, index);
-}
-# endif