Index: /branches/meh_branches/ppstack_test/ippconfig/recipes/ppStack.config
===================================================================
--- /branches/meh_branches/ppstack_test/ippconfig/recipes/ppStack.config	(revision 34049)
+++ /branches/meh_branches/ppstack_test/ippconfig/recipes/ppStack.config	(revision 34050)
@@ -83,6 +83,9 @@
 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	FALSE		# Determine output PSF size from input PSFs?
+# need to add/mod autosize to allow for simple autosize versus envelope
+# PSF.AUTOENVEL		BOOL	TRUE		# rather than autosize
+PSF.OUTPUT.FWHM		F32	5.0		# Target size for output PSF (if not auto-sized), -1 as FWHM
+PSF.OUTPUT.NFWHMSIG	F32	0.0		# N FWHM-sig to be added to the FWHMmean for PSF
 
 PSF.INPUT.MAX           F32  NAN
Index: /branches/meh_branches/ppstack_test/ppStack/src/ppStack.h
===================================================================
--- /branches/meh_branches/ppstack_test/ppStack/src/ppStack.h	(revision 34049)
+++ /branches/meh_branches/ppstack_test/ppStack/src/ppStack.h	(revision 34050)
@@ -63,5 +63,6 @@
                   int numCols, int numRows, // Size of image
                   const psArray *psfs,  // List of input PSFs
-                  const psVector *inputMask // Mask for inputs
+//                  const psVector *inputMask // Mask for inputs
+                  ppStackOptions *options // options including Mask for inputs
     );
 
Index: /branches/meh_branches/ppstack_test/ppStack/src/ppStackOptions.c
===================================================================
--- /branches/meh_branches/ppstack_test/ppStack/src/ppStackOptions.c	(revision 34049)
+++ /branches/meh_branches/ppstack_test/ppStack/src/ppStackOptions.c	(revision 34050)
@@ -60,4 +60,6 @@
     options->exposures = NULL;
     options->targetSeeing = NAN;
+    options->clippedMean = NAN;
+    options->clippedStdev = NAN;
     options->inputMask = NULL;
     options->sourceLists = NULL;
Index: /branches/meh_branches/ppstack_test/ppStack/src/ppStackPSF.c
===================================================================
--- /branches/meh_branches/ppstack_test/ppStack/src/ppStackPSF.c	(revision 34049)
+++ /branches/meh_branches/ppstack_test/ppStack/src/ppStackPSF.c	(revision 34050)
@@ -10,6 +10,7 @@
     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,17 +53,24 @@
 	}
     } 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
Index: /branches/meh_branches/ppstack_test/ppStack/src/ppStackPrepare.c
===================================================================
--- /branches/meh_branches/ppstack_test/ppStack/src/ppStackPrepare.c	(revision 34049)
+++ /branches/meh_branches/ppstack_test/ppStack/src/ppStackPrepare.c	(revision 34050)
@@ -336,5 +336,5 @@
     if (options->convolve) {
       //        options->psf = ppStackPSF(config, numCols, numRows, psfs, options->inputMask);
-        options->psf = ppStackPSF(config, numCols, numRows, psfs, options);
+	options->psf = ppStackPSF(config, numCols, numRows, psfs, options);
         psFree(psfs);
         if (!options->psf) {