Changeset 34046

Timestamp:

Jun 20, 2012, 11:53:21 AM (14 years ago)

Author:

mhuber

Message:

adding parts for simple model mean target PSF

Location:

branches/meh_branches/ppstack_test/ppStack/src

Files:

• ppStackOptions.h (modified) (1 diff)
• ppStackPSF.c (modified) (3 diffs)
• ppStackPrepare.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackOptions.h

@@ -32 +32 @@
     psVector *airmassInput;             // airmass of input exposure
     psArray *sources;                   // Matched sources
+    // input stats
+    float clippedMean;                  // clipped mean of input fwhm
+    float clippedStdev;                 // clipped stdev of input fwhm 
     // Convolve
     psArray *cells;                     // Cells for convolved images --- a handle for reading again

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

@@ -3 +3 @@
 //#define TESTING
 
+//pmPSF *ppStackPSF(const pmConfig *config, int numCols, int numRows,
+//                  const psArray *psfs, const psVector *inputMask)
 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 options->inputMask
 
     // Get the recipe values
@@ -49 +53 @@
     } else {
 
-        // Manually defined target PSF 
+        //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) {
@@ -55 +64 @@
         }
 
-        //MEH -- add option for manually defined versus simply defined but not fully autosized?
-
+      }
 
         //MEH -- 2.35 or 2.355 as seen elsewhere? small difference though

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

@@ -306 +306 @@
     psLogMsg("ppStack", PS_LOG_INFO, "Input FWHMs : %f +/- %f", fwhmStats->clippedMean, fwhmStats->clippedStdev);
 
+    //MEH -- add clippedMean/clippedStdev to options, may want to be part of clipFWHMnSig?
+    options->clippedMean =  fwhmStats->clippedMean;
+    options->clippedStdev = fwhmStats->clippedStdev;
+     
+
     if (isfinite(clipFWHMnSig)) {
         float fwhmLimit = fwhmStats->clippedMean + clipFWHMnSig * fwhmStats->clippedStdev;
@@ -318 +323 @@
     }
 
-    //MEH -- by option could reset maxFWHM and reject any > before going into target ppStackPSF however will be masked and not included in conv/unconv stack in end rather than rej from deconv limit
-
-    //MEH -- could use fwhmStats->clippedMean+X to internally set PSF.OUTPUT.FWHM but called in ppStackPSF and would need to pass it
-
 
     //MEH - try runnning every thing that can reject images before target psf and conv - 
@@ -334 +335 @@
     // Generate target PSF
     if (options->convolve) {
-        options->psf = ppStackPSF(config, numCols, numRows, psfs, options->inputMask);
+      //        options->psf = ppStackPSF(config, numCols, numRows, psfs, options->inputMask);
+        options->psf = ppStackPSF(config, numCols, numRows, psfs, options);
         psFree(psfs);
         if (!options->psf) {