Changeset 13920

Timestamp:

Jun 20, 2007, 10:45:00 AM (19 years ago)

Author:

Paul Price

Message:

Adding boxcar/gaussian smoothing of overscan vector

Location:

trunk/psModules/src/detrend

Files:

• pmBias.c (modified) (4 diffs)
• pmBias.h (modified) (3 diffs)

trunk/psModules/src/detrend/pmBias.c

@@ -17 +17 @@
 #include "pmBias.h"
 
+#define SMOOTH_NSIGMA 4.0               // Number of Gaussian sigma the smoothing kernel extends
+
+
 static void overscanOptionsFree(pmOverscanOptions *options)
 {
@@ -24 +27 @@
 }
 
-pmOverscanOptions *pmOverscanOptionsAlloc(bool single, pmFit fitType, unsigned int order, psStats *stat)
+pmOverscanOptions *pmOverscanOptionsAlloc(bool single, pmFit fitType, unsigned int order, psStats *stat,
+                                          int boxcar, float gauss)
 {
     pmOverscanOptions *opts = psAlloc(sizeof(pmOverscanOptions));
@@ -34 +38 @@
     opts->order = order;
     opts->stat = psMemIncrRefCounter(stat);
+
+    // Smoothing
+    opts->boxcar = boxcar;
+    opts->gauss = gauss;
 
     // Outputs
@@ -151 +159 @@
             mask->data.U8[i] = 1;
         }
+    }
+
+    // Smooth the reduced vector
+    if (overscanOpts->boxcar > 0) {
+        psVector *smoothed = psVectorBoxcar(NULL, reduced, overscanOpts->boxcar); // Smoothed vector
+        psFree(reduced);
+        reduced = smoothed;
+    }
+    if (isfinite(overscanOpts->gauss) && overscanOpts->gauss > 0) {
+        if (overscanOpts->boxcar > 0) {
+            psWarning("Gaussian smoothing the boxcar smoothed overscan --- you asked for it.");
+        }
+        psVector *smoothed = psVectorSmooth(NULL, reduced, overscanOpts->gauss, SMOOTH_NSIGMA);
+        psFree(reduced);
+        reduced = smoothed;
     }
 

trunk/psModules/src/detrend/pmBias.h

@@ -5 +5 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-06-14 02:03:29 $
+ * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-20 20:45:00 $
  * Copyright 2004--2006 Institute for Astronomy, University of Hawaii
  */
@@ -34 +34 @@
 {
     // Inputs
-    bool single;                ///< Reduce all overscan regions to a single value?
-    pmFit fitType;              ///< Type of fit to overscan
-    unsigned int order;         ///< Order of polynomial, or number of spline pieces
-    psStats *stat;              ///< Statistic to use when reducing the minor direction
+    bool single;                        ///< Reduce all overscan regions to a single value?
+    pmFit fitType;                      ///< Type of fit to overscan
+    unsigned int order;                 ///< Order of polynomial, or number of spline pieces
+    psStats *stat;                      ///< Statistic to use when reducing the minor direction
+    int boxcar;                         ///< Boxcar smoothing radius
+    float gauss;                        ///< Gaussian smoothing sigma
     // Outputs
-    psPolynomial1D *poly;       ///< Result of polynomial fit
-    psSpline1D *spline;         ///< Result of spline fit
+    psPolynomial1D *poly;               ///< Result of polynomial fit
+    psSpline1D *spline;                 ///< Result of spline fit
 }
 pmOverscanOptions;
@@ -46 +48 @@
 /// Allocator for overscan options
 pmOverscanOptions *pmOverscanOptionsAlloc(bool single, ///< Reduce all overscan regions to a single value?
-        pmFit fitType, ///< Type of fit to overscan
-        unsigned int order, ///< Order of polynomial, or number of splines
-        psStats *stat ///< Statistic to use
+                                          pmFit fitType, ///< Type of fit to overscan
+                                          unsigned int order, ///< Order of polynomial, or number of splines
+                                          psStats *stat, ///< Statistic to use
+                                          int boxcar, ///< Boxcar smoothing radius
+                                          float gauss ///< Gaussian smoothing sigma
                                          );