Changeset 34050 for branches/meh_branches/ppstack_test/ppStack/src/ppStackPSF.c

Timestamp:

Jun 20, 2012, 7:59:19 PM (14 years ago)

Author:

mhuber

Message:

working version for target FWHM mean simple PSF in ppstack

File:

• branches/meh_branches/ppstack_test/ppStack/src/ppStackPSF.c (modified) (2 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackPSF.c

@@ -10 +10 @@
     bool mdok = false;
     pmPSF *psf = NULL;
-
-    const psVector options->inputMask
+    
+    //MEH - where should this be put now?
+    const psVector *inputMask = options->inputMask;
 
     // Get the recipe values
@@ -52 +53 @@
         }
     } else {
+        // Manually static defined target PSF 
+        float psfFWHM = psMetadataLookupF32(&mdok, recipe, "PSF.OUTPUT.FWHM"); // Radius for PSF
+        if (!mdok) {
+            psfFWHM = 4.0;
+        }
 
-        //MEH -- add option for manually defined versus simply defined but not fully autosized?
-      if (1){
-        float psfFWHM = options->clippedMean;
-      } else {
-
-        // Manually static defined target PSF 
-        float psfFWHM = psMetadataLookupF32(&mdok, recipe, "PSF.OUTPUT.FWHM"); // Radius for PSF
-        if (!mdok) {
-            psfFWHM = 4.0;
+        //MEH -- add option -1 for manually defined versus simply defined but not fully autosized? call it what?
+        if (psfFWHM<0.0){
+            float NpsfFWHMsig = psMetadataLookupF32(&mdok, recipe, "PSF.OUTPUT.NFWHMSIG"); // Nsig to include
+            if (!mdok){
+                NpsfFWHMsig = 0.0;
+            }
+//          psfFWHM = options->clippedMean;
+            float clippedMean = options->clippedMean;
+            float clippedStdev = options->clippedStdev;
+            psfFWHM = clippedMean + NpsfFWHMsig*clippedStdev;
+            if (NpsfFWHMsig<0.0){
+                psfFWHM = clippedMean + NpsfFWHMsig * -1.0*clippedStdev/clippedMean;
+            }
         }
-
-      }
 
         //MEH -- 2.35 or 2.355 as seen elsewhere? small difference though