Changeset 29452 for branches/eam_branches/ipp-20100823/ppSub/src/ppSubMatchPSFs.c

Timestamp:

Oct 17, 2010, 9:15:54 AM (16 years ago)

Author:

eugene

Message:

call pmVisualClose; update to auto-scaling (set up fwhm separately for windowing)

File:

• branches/eam_branches/ipp-20100823/ppSub/src/ppSubMatchPSFs.c (modified) (6 diffs)

branches/eam_branches/ipp-20100823/ppSub/src/ppSubMatchPSFs.c

@@ -110 +110 @@
     pmReadout *kernelRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT.KERNELS"); // RO with kernel
     if (kernelRO) {
+        psAbort("we probably need to set the FWHM values");
         psFree(view);
         return true;
@@ -117 +118 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSim
     psAssert(recipe, "We checked this earlier, so it should be here.");
-    if (!psMetadataLookupBool(NULL, recipe, "SCALE")) {
-        // No scaling requested
-        psFree(view);
-        return true;
-    }
 
     // Input images
@@ -131 +127 @@
     pmReadout *refSourceRO = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.SOURCES");
     if (!inSourceRO || !refSourceRO) {
-        psWarning("Unable to scale kernel, since no sources were provided.");
-        return true;
+        psError(PPSUB_ERR_DATA, false, "Unable to scale kernel, since no sources were provided.");
+        return false;
     }
 
@@ -141 +137 @@
 
     if (!inDetections || !refDetections) {
-        psWarning("Unable to scale kernel, since no sources were provided.");
-        return true;
+        psError(PPSUB_ERR_DATA, false, "Unable to set FWHM or scale kernel, since no sources were provided.");
+        return false;
     }
 
@@ -161 +157 @@
     psLogMsg("ppSub", PS_LOG_INFO, "Input FWHM: %f\nReference FWHM: %f\n", inFWHM, refFWHM);
     if (!isfinite(inFWHM) || !isfinite(refFWHM)) {
-        psWarning("Unable to scale kernel, since unable to measure PSFs.");
+        psError(PPSUB_ERR_DATA, false, "Cannot determine FHWM for images, giving up.");
+        return false;
+    }
+
+    // we need to register the FWHM values for use downstream 
+    pmSubtractionSetFWHMs(inFWHM, refFWHM);
+
+    // is auto-scaling needed?
+    if (!psMetadataLookupBool(NULL, recipe, "SCALE")) {
+        // No scaling requested
+        psFree(view);
         return true;
     }
@@ -175 +181 @@
     }
 
-    if (!pmSubtractionParamsScale(kernelSize, stampSize, kernelWidths, inFWHM, refFWHM,
-                                  scaleRef, scaleMin, scaleMax)) {
+    if (!pmSubtractionParamsScale(kernelSize, stampSize, kernelWidths, scaleRef, scaleMin, scaleMax)) {
         psError(PPSUB_ERR_DATA, false, "Unable to scale parameters.");
         return false;