Changeset 26671

Timestamp:

Jan 22, 2010, 11:45:18 AM (16 years ago)

Author:

Paul Price

Message:

Adding scaling of kernel parameters by seeing FWHMs.

Location:

branches/eam_branches/20091201/ppStack/src

Files:

• ppStackMatch.c (modified) (4 diffs)
• ppStackOptions.c (modified) (2 diffs)
• ppStackOptions.h (modified) (1 diff)
• ppStackPrepare.c (modified) (4 diffs)

branches/eam_branches/20091201/ppStack/src/ppStackMatch.c

@@ -316 +316 @@
             int optOrder = psMetadataLookupS32(&mdok, ppsub, "OPTIMUM.ORDER"); // Order for search
             float poorFrac = psMetadataLookupF32(&mdok, ppsub, "POOR.FRACTION"); // Fraction for "poor"
+
+            bool scale = psMetadataLookupBool(NULL, recipe, "SCALE");        // Scale kernel parameters?
+            float scaleRef = psMetadataLookupF32(NULL, recipe, "SCALE.REF"); // Reference for scaling
+            float scaleMin = psMetadataLookupF32(NULL, recipe, "SCALE.MIN"); // Minimum for scaling
+            float scaleMax = psMetadataLookupF32(NULL, recipe, "SCALE.MAX"); // Maximum for scaling
+            if (!isfinite(scaleRef) || !isfinite(scaleMin) || !isfinite(scaleMax)) {
+                psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                        "Scale parameters (SCALE.REF=%f, SCALE.MIN=%f, SCALE.MAX=%f) not set in recipe.",
+                        scaleRef, scaleMin, scaleMax);
+                return false;
+            }
+
 
             // These values are specified specifically for stacking
@@ -410 +422 @@
                 }
             } else {
+                // Scale the input parameters
+                psVector *widthsCopy = psVectorCopy(NULL, widths, PS_TYPE_F32); // Copy of kernel widths
+                if (scale && !pmSubtractionParamsScale(&size, &footprint, widthsCopy,
+                                                       options->inputSeeing->data.F32[index],
+                                                       options->targetSeeing, scaleRef, scaleMin, scaleMax)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to scale kernel parameters");
+                    psFree(fake);
+                    psFree(optWidths);
+                    psFree(stampSources);
+                    psFree(conv);
+                    psFree(widthsCopy);
+                    if (threads > 0) {
+                        pmSubtractionThreadsFinalize(readout, fake);
+                    }
+                    return false;
+                }
+
                 if (!pmSubtractionMatch(NULL, conv, fake, readout, footprint, stride, regionSize, spacing,
-                                        threshold, stampSources, stampsName, type, size, order, widths,
+                                        threshold, stampSources, stampsName, type, size, order, widthsCopy,
                                         orders, inner, ringsOrder, binning, penalty,
                                         optimum, optWidths, optOrder, optThresh, iter, rej, sysError, skyErr,
@@ -421 +450 @@
                     psFree(stampSources);
                     psFree(conv);
+                    psFree(widthsCopy);
                     if (threads > 0) {
                         pmSubtractionThreadsFinalize(readout, fake);
@@ -426 +456 @@
                     return false;
                 }
+                                              psFree(widthsCopy);
             }
 

branches/eam_branches/20091201/ppStack/src/ppStackOptions.c

@@ -20 +20 @@
     psFree(options->convVariances);
     psFree(options->psf);
+    psFree(options->inputSeeing);
     psFree(options->inputMask);
     psFree(options->sourceLists);
@@ -54 +55 @@
     options->num = 0;
     options->psf = NULL;
+    options->inputSeeing = NULL;
+    options->targetSeeing = NAN;
     options->inputMask = NULL;
     options->sourceLists = NULL;

branches/eam_branches/20091201/ppStack/src/ppStackOptions.h

@@ -18 +18 @@
     // Prepare
     pmPSF *psf;                         // Target PSF
+    psVector *inputSeeing;              // Input seeing FWHMs
+    float targetSeeing;                 // Target seeing FWHM
     float sumExposure;                  // Sum of exposure times
     psVector *inputMask;                // Mask for inputs

branches/eam_branches/20091201/ppStack/src/ppStackPrepare.c

@@ -176 +176 @@
 
 
-        bool redoPhot = psMetadataLookupBool(NULL, recipe, "PHOT");
-        psArray *sources = NULL;
-
-        if (options->convolve || options->matchZPs || redoPhot) {
-            pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Readout with sources
-            sources = psMetadataLookupPtr(NULL, ro->analysis, "PSPHOT.SOURCES"); // Sources
-            if (!sources) {
-                psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find sources in readout.");
-                return NULL;
-            }
-            options->sourceLists->data[index] = psMemIncrRefCounter(sources);
-        }
+        bool redoPhot = psMetadataLookupBool(NULL, recipe, "PHOT");
+        psArray *sources = NULL;
+
+        if (options->convolve || options->matchZPs || redoPhot) {
+            pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Readout with sources
+            sources = psMetadataLookupPtr(NULL, ro->analysis, "PSPHOT.SOURCES"); // Sources
+            if (!sources) {
+                psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find sources in readout.");
+                return NULL;
+            }
+            options->sourceLists->data[index] = psMemIncrRefCounter(sources);
+        }
 
         // Re-do photometry if we don't trust the source lists
@@ -194 +194 @@
             pmFPAfileActivate(config->files, false, NULL);
             ppStackFileActivationSingle(config, PPSTACK_FILES_CONVOLVE, true, index);
-            if (options->convolve) {
-                pmFPAfileActivate(config->files, true, "PPSTACK.CONV.KERNEL");
-            }
+            if (options->convolve) {
+                pmFPAfileActivate(config->files, true, "PPSTACK.CONV.KERNEL");
+            }
             pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT", index); // File
             pmFPAview *photView = ppStackFilesIterateDown(config);
@@ -225 +225 @@
     }
     psFree(fileIter);
+
+    psString log = psStringCopy("Input seeing FWHMs:\n"); // Log message
+    bool havePSFs = false;                                // Do we have any PSFs?
+    options->inputSeeing = psVectorAlloc(num, PS_TYPE_F32);
+    psVectorInit(options->inputSeeing, NAN);
+    for (int i = 0; i < num; i++) {
+        pmPSF *psf = psfs->data[i];     // PSF for image
+        if (!psf) {
+            continue;
+        }
+        havePSFs = true;
+        float fwhm = pmPSFtoFWHM(psf, 0.5 * numCols, 0.5 * numRows); // FWHM for image
+        psStringAppend(&log, "Input %d: %f\n", i, fwhm);
+        options->inputSeeing->data.F32[i] = fwhm;
+    }
+    if (havePSFs) {
+        psLogMsg("ppStack", PS_LOG_INFO, "%s", log);
+    }
+    psFree(log);
 
     // Generate target PSF
@@ -237 +256 @@
         psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "PSF.TARGET", PS_DATA_UNKNOWN,
                          "Target PSF for stack", options->psf);
+        options->targetSeeing = pmPSFtoFWHM(options->psf, 0.5 * numCols, 0.5 * numRows); // FWHM for target
+        psLogMsg("ppStack", PS_LOG_INFO, "Target seeing FWHM: %f\n", options->targetSeeing);
 
         pmChip *outChip = pmFPAfileThisChip(config->files, view, "PPSTACK.OUTPUT"); // Output chip