Changeset 29453

Timestamp:

Oct 17, 2010, 9:18:24 AM (16 years ago)

Author:

eugene

Message:

call pmVisualClose; allow stack target fwhm to be manually set; set up fwhm separately for windowing

Location:

branches/eam_branches/ipp-20100823/ppStack/src

Files:

• ppStack.c (modified) (1 diff)
• ppStackMatch.c (modified) (1 diff)
• ppStackPSF.c (modified) (1 diff)

branches/eam_branches/ipp-20100823/ppStack/src/ppStack.c

@@ -124 +124 @@
         psLibFinalize();
         pmVisualClose();
+        pmVisualCleanup ();
 
         exitValue = ppStackExitCode(exitValue);

branches/eam_branches/ipp-20100823/ppStack/src/ppStackMatch.c

@@ -320 +320 @@
                 }
             } else {
+                // we need to register the FWHM values for use downstream 
+                pmSubtractionSetFWHMs(options->inputSeeing->data.F32[index], options->targetSeeing);
+
                 // 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)) {
+                if (scale && !pmSubtractionParamsScale(&size, &footprint, widthsCopy, scaleRef, scaleMin, scaleMax)) {
                     psError(psErrorCodeLast(), false, "Unable to scale kernel parameters");
                     psFree(fake);

branches/eam_branches/ipp-20100823/ppStack/src/ppStackPSF.c

@@ -15 +15 @@
 {
     bool mdok = false;
+    pmPSF *psf = NULL;
 
-#ifndef TESTING
     // Get the recipe values
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
     psAssert(recipe, "We've thrown an error on this before.");
 
-    int psfInstances = psMetadataLookupS32(NULL, recipe, "PSF.INSTANCES"); // Number of instances for PSF
-    float psfRadius = psMetadataLookupF32(NULL, recipe, "PSF.RADIUS"); // Radius for PSF
-    const char *psfModel = psMetadataLookupStr(NULL, recipe, "PSF.MODEL"); // Model for PSF
-    int psfOrder = psMetadataLookupS32(NULL, recipe, "PSF.ORDER"); // Spatial order for PSF
-
-    psString maskValStr = psMetadataLookupStr(&mdok, recipe, "MASK.VAL"); // Name of bits to mask going in
-    if (!mdok || !maskValStr) {
-        psError(PPSTACK_ERR_CONFIG, false, "Unable to find MASK.VAL in recipe");
-        return false;
-    }
-    psImageMaskType maskVal = pmConfigMaskGet(maskValStr, config); // Bits to mask
-
-    for (int i = 0; i < psfs->n; i++) {
-        if (inputMask->data.U8[i]) {
-            psFree(psfs->data[i]);
-            psfs->data[i] = NULL;
-        }
+    bool autosize = psMetadataLookupBool(&mdok, recipe, "PSF.AUTOSIZE"); // Spatial order for PSF
+    if (!mdok) {
+        // older config files which lack PSF.AUTOSIZE used TRUE as the default
+        autosize = true;
     }
 
-    // Solve for the target PSF
-    pmPSF *psf = pmPSFEnvelope(numCols, numRows, psfs, psfInstances, psfRadius, psfModel, psfOrder, psfOrder, maskVal);
-    if (!psf) {
-        psError(PPSTACK_ERR_PSF, false, "Unable to determine output PSF.");
-        return NULL;
+    char *psfModel = psMetadataLookupStr(NULL, recipe, "PSF.MODEL"); // Model for PSF
+
+    if (autosize) {
+
+        int psfInstances = psMetadataLookupS32(NULL, recipe, "PSF.INSTANCES"); // Number of instances for PSF
+        float psfRadius = psMetadataLookupF32(NULL, recipe, "PSF.RADIUS"); // Radius for PSF
+        int psfOrder = psMetadataLookupS32(NULL, recipe, "PSF.ORDER"); // Spatial order for PSF
+
+        psString maskValStr = psMetadataLookupStr(&mdok, recipe, "MASK.VAL"); // Name of bits to mask going in
+        if (!mdok || !maskValStr) {
+            psError(PPSTACK_ERR_CONFIG, false, "Unable to find MASK.VAL in recipe");
+            return NULL;
+        }
+        psImageMaskType maskVal = pmConfigMaskGet(maskValStr, config); // Bits to mask
+
+        for (int i = 0; i < psfs->n; i++) {
+            if (inputMask->data.U8[i]) {
+                psFree(psfs->data[i]);
+                psfs->data[i] = NULL;
+            }
+        }
+
+        // Solve for the target PSF
+        psf = pmPSFEnvelope(numCols, numRows, psfs, psfInstances, psfRadius, psfModel, psfOrder, psfOrder, maskVal);
+        if (!psf) {
+            psError(PPSTACK_ERR_PSF, false, "Unable to determine output PSF.");
+            return NULL;
+        }
+    } else {
+
+        // Manually defined target PSF 
+        float psfFWHM = psMetadataLookupF32(&mdok, recipe, "PSF.OUTPUT.FWHM"); // Radius for PSF
+        if (!mdok) {
+            psfFWHM = 4.0;
+        }
+
+        float Mxx = M_SQRT2 * psfFWHM / 2.35;
+
+        psf = pmPSFBuildSimple(psfModel, Mxx, Mxx, 0.0, 0.0);
+        if (!psf) {
+            psError(PPSTACK_ERR_PSF, false, "Unable to build dummy PSF.");
+            return NULL;
+        }
     }
-#else
-    // Dummy PSF
-    pmPSF *psf = pmPSFBuildSimple("PS_MODEL_PS1_V1", 4.0, 4.0, 0.0, 1.0);
-    if (!psf) {
-        psError(PPSTACK_ERR_PSF, false, "Unable to build dummy PSF.");
-        return NULL;
-    }
-#endif
 
     return psf;