Changeset 34091 for trunk

Timestamp:

Jun 26, 2012, 1:09:06 PM (14 years ago)

Author:

mhuber

Message:

adding option to set target FWHM mean of simple PSF for convolved stacks

Location:

trunk

Files:

• ippconfig/recipes/ppStack.config (modified) (1 diff)
• ppStack/src/ppStackPSF.c (modified) (2 diffs)
• ppStack/src/ppStackPrepare.c (modified) (1 diff)

trunk/ippconfig/recipes/ppStack.config

@@ -83 +83 @@
 PSF.MODEL       STR     PS_MODEL_GAUSS  # Model for PSF generation
 
-PSF.AUTOSIZE    BOOL    TRUE            # Determine output PSF size from input PSFs?
-PSF.OUTPUT.FWHM F32     5.0             # Target size for output PSF (if not auto-sized)
+PSF.AUTOSIZE            BOOL    TRUE            # Determine output PSF size from input PSFs?
+PSF.OUTPUT.FWHM         F32     5.0             # Target size for output PSF (if not auto-sized), -1 as mean FWHM inputs 
+PSF.OUTPUT.NFWHMSIG     F32     0.0             # N FWHM-sig to be added to the FWHMmean for PSF
+
 
 PSF.INPUT.MAX           F32  NAN

trunk/ppStack/src/ppStackPSF.c

@@ -4 +4 @@
 
 pmPSF *ppStackPSF(const pmConfig *config, int numCols, int numRows,
-                  const psArray *psfs, const psVector *inputMask)
+                  const psArray *psfs, ppStackOptions *options)
 {
     bool mdok = false;
     pmPSF *psf = NULL;
+
+    const psVector *inputMask = options->inputMask;
 
     // Get the recipe values
@@ -55 +57 @@
         }
 
+        //MEH -- preliminary add option -1 for choosing mean FWHM of inputs. Nsig<0 for scaling +Nsig by mean
+        if (psfFWHM<0.0){
+            float NpsfFWHMsig = psMetadataLookupF32(&mdok, recipe, "PSF.OUTPUT.NFWHMSIG"); // Nsig to include
+            if (!mdok){
+                NpsfFWHMsig = 0.0;
+            }
+            float clippedMean = options->clippedMean;
+            float clippedStdev = options->clippedStdev;
+            psfFWHM = clippedMean + NpsfFWHMsig*clippedStdev;
+            if (NpsfFWHMsig<0.0){
+                psfFWHM = clippedMean + NpsfFWHMsig * -1.0*clippedStdev/clippedMean;
+            }
+        }
+
+
+
         float Mxx = M_SQRT2 * psfFWHM / 2.35;
 

trunk/ppStack/src/ppStackPrepare.c

@@ -318 +318 @@
     // Generate target PSF
     if (options->convolve) {
-        options->psf = ppStackPSF(config, numCols, numRows, psfs, options->inputMask);
+        options->psf = ppStackPSF(config, numCols, numRows, psfs, options);
         psFree(psfs);
         if (!options->psf) {