From 90dbf7a5bbaa0e19e600b043a35dc2e9d0285706 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Fri, 4 Aug 2017 14:32:30 -0400
Subject: clean smooth

---
 tksao/frame/context.C      |   4 +-
 tksao/frame/fitsanalysis.C | 112 ++++++++++++++++++++++++++++++++++++++++++-
 tksao/frame/fitsimage.h    |   2 -
 tksao/util/smooth.C        | 117 ---------------------------------------------
 tksao/util/smooth.h        |  13 -----
 5 files changed, 112 insertions(+), 136 deletions(-)
 delete mode 100644 tksao/util/smooth.C
 delete mode 100644 tksao/util/smooth.h

diff --git a/tksao/frame/context.C b/tksao/frame/context.C
index 6dc234f..c7736c5 100644
--- a/tksao/frame/context.C
+++ b/tksao/frame/context.C
@@ -92,8 +92,8 @@ Context::Context()
   smoothFunction_ =GAUSSIAN;
   smoothRadius_ =3;
   smoothRadiusMinor_ =3;
-  smoothSigma_ =1;
-  smoothSigmaMinor_ =1;
+  smoothSigma_ =1.5;
+  smoothSigmaMinor_ =1.5;
   smoothAngle_ =0;
 
   thread_ =NULL;
diff --git a/tksao/frame/fitsanalysis.C b/tksao/frame/fitsanalysis.C
index b9c73e7..e895d9b 100644
--- a/tksao/frame/fitsanalysis.C
+++ b/tksao/frame/fitsanalysis.C
@@ -6,10 +6,13 @@
 
 #include "fitsimage.h"
 #include "analysis.h"
-#include "smooth.h"
 #include "context.h"
 
-void* convolve(void* tt);
+static void boxcar(double* kernel, int r);
+static void tophat(double* kernel, int r);
+static void gaussian(double* kernel, int r, double sigma);
+static void elliptic(double* kernel, int r, int m, double ss, double sm, double aa);
+static void* convolve(void* tt);
 
 void FitsImage::analysis(int which, pthread_t* thread, t_smooth_arg* targ)
 {
@@ -106,6 +109,111 @@ void FitsImage::smooth(pthread_t* thread, t_smooth_arg* targ)
     internalError("Unable to Create Thread");
 }
 
+static void boxcar(double* kernel, int k)
+{
+  int kk = 2*k+1;
+  int kk2 = kk*kk;
+
+  for (int yy=-k; yy<=k; yy++)
+    for (int xx=-k; xx<=k; xx++)
+	kernel[(yy+k)*kk+(xx+k)] = 1;
+
+  // normalize kernel
+  for (int ii=0; ii<kk2; ii++)
+    kernel[ii] /= kk2;
+
+  //  dumpKernel(kernel, k);
+}
+
+void tophat(double* kernel, int k)
+{
+  int k2 = k*k;
+  int kk = 2*k+1;
+  int kk2 = kk*kk;
+
+  int cnt =0;
+  for (int yy=-k; yy<=k; yy++)
+    for (int xx=-k; xx<=k; xx++)
+      if ((xx*xx + yy*yy)/k2 <= 1) {
+	kernel[(yy+k)*kk+(xx+k)] = 1;
+	cnt++;
+      }
+
+  // normalize kernel
+  if (cnt) 
+    for (int ii=0; ii<kk2; ii++)
+      kernel[ii] /= cnt;
+
+  //  dumpKernel(kernel, k);
+}
+
+void gaussian(double* kernel, int k, double ss)
+{
+  int k2 = k*k;
+  int kk = 2*k+1;
+  int kk2 = kk*kk;
+  double s2 = ss*ss;
+
+  double tt =0;
+  for (int yy=-k; yy<=k; yy++)
+    for (int xx=-k; xx<=k; xx++) {
+      if ((xx*xx + yy*yy) <= k2) {
+	double vv = exp(-.5*((xx*xx + yy*yy)/s2));
+	kernel[(yy+k)*kk+(xx+k)] = vv;
+	tt += vv;
+      }
+    }
+
+  // normalize kernel
+  if (tt) 
+    for (int ii=0; ii<kk2; ii++)
+      kernel[ii] /= tt;
+
+  // dumpKernel(kernel, k);
+}
+
+void elliptic(double* kernel, int k, int rm, double ss, double sm, double aa)
+{
+  int kk = 2*k+1;
+  int kk2 = kk*kk;
+  double s2 = ss*ss;
+  double sm2 = sm*sm;
+
+  double a = cos(aa)*cos(aa)/(2*s2) + sin(aa)*sin(aa)/(2*sm2);
+  double b = -sin(2*aa)/(4*s2) + sin(2*aa)/(4*sm2);
+  double c = sin(aa)*sin(aa)/(2*s2) + cos(aa)*cos(aa)/(2*sm2);
+
+  double tt =0;
+  for (int yy=-k; yy<=k; yy++) {
+    for (int xx=-k; xx<=k; xx++) {
+      double dd = xx*cos(aa)+yy*sin(aa);
+      double ee = xx*sin(aa)-yy*cos(aa);
+      if ((dd*dd)/(k*k) + (ee*ee)/(rm*rm) <= 1) {
+	double vv = exp(-(a*xx*xx + 2*b*xx*yy + c*yy*yy));
+	kernel[(yy+k)*kk+(xx+k)] = vv;
+	tt += vv;
+      }
+    }
+  }
+
+  // normalize kernel
+  if (tt) 
+    for (int ii=0; ii<kk2; ii++)
+      kernel[ii] /= tt;
+
+  // dumpKernel(kernel, k);
+}
+
+void dumpKernel(double* kernel, int k)
+{
+  int kk = 2*k+1;
+
+  for (int yy=-k; yy<=k; yy++)
+    for (int xx=-k; xx<=k; xx++)
+      cerr << '(' << xx << ',' << yy << ")=" 
+	   << kernel[(yy+k)*kk+(xx+k)] << endl;
+}
+
 void* convolve(void* tt)
 {
   t_smooth_arg* targ = (t_smooth_arg*)tt;
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index 59ac782..29a6235 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -13,8 +13,6 @@
 #include "wcs.h"
 #include "head.h"
 
-#include "smooth.h"
-
 // WCS ' ','A' to 'Z', WCS0
 #define MULTWCS 27
 #define MULTWCSA 28
diff --git a/tksao/util/smooth.C b/tksao/util/smooth.C
deleted file mode 100644
index f87d9f2..0000000
--- a/tksao/util/smooth.C
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (C) 1999-2017
-// Smithsonian Astrophysical Observatory, Cambridge, MA, USA
-// For conditions of distribution and use, see copyright notice in "copyright"
-
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
-#include <math.h>
-
-#include "smooth.h"
-
-static void dumpKernel(double* kernel, int k);
-
-void boxcar(double* kernel, int k)
-{
-  int kk = 2*k+1;
-  int kk2 = kk*kk;
-
-  for (int yy=-k; yy<=k; yy++)
-    for (int xx=-k; xx<=k; xx++)
-	kernel[(yy+k)*kk+(xx+k)] = 1;
-
-  // normalize kernel
-  for (int ii=0; ii<kk2; ii++)
-    kernel[ii] /= kk2;
-
-  //  dumpKernel(kernel, k);
-}
-
-void tophat(double* kernel, int k)
-{
-  int k2 = k*k;
-  int kk = 2*k+1;
-  int kk2 = kk*kk;
-
-  int cnt =0;
-  for (int yy=-k; yy<=k; yy++)
-    for (int xx=-k; xx<=k; xx++)
-      if ((xx*xx + yy*yy)/k2 <= 1) {
-	kernel[(yy+k)*kk+(xx+k)] = 1;
-	cnt++;
-      }
-
-  // normalize kernel
-  if (cnt) 
-    for (int ii=0; ii<kk2; ii++)
-      kernel[ii] /= cnt;
-
-  //  dumpKernel(kernel, k);
-}
-
-void gaussian(double* kernel, int k, double ss)
-{
-  int k2 = k*k;
-  int kk = 2*k+1;
-  int kk2 = kk*kk;
-  double s2 = ss*ss;
-
-  double total =0;
-  for (int yy=-k; yy<=k; yy++)
-    for (int xx=-k; xx<=k; xx++)
-      if ((xx*xx + yy*yy)/k2 <= 1) {
-	double vv = exp(-.5*((xx*xx + yy*yy)/s2));
-	kernel[(yy+k)*kk+(xx+k)] = vv;
-	total += vv;
-      }
-
-  // normalize kernel
-  if (total) 
-    for (int ii=0; ii<kk2; ii++)
-      kernel[ii] /= total;
-
-  //  dumpKernel(kernel, k);
-}
-
-void elliptic(double* kernel, int k, int rm, double ss, double sm, double aa)
-{
-  int kk = 2*k+1;
-  int kk2 = kk*kk;
-  double s2 = ss*ss;
-  double sm2 = sm*sm;
-
-  double a = cos(aa)*cos(aa)/(2*s2) + sin(aa)*sin(aa)/(2*sm2);
-  double b = -sin(2*aa)/(4*s2) + sin(2*aa)/(4*sm2);
-  double c = sin(aa)*sin(aa)/(2*s2) + cos(aa)*cos(aa)/(2*sm2);
-
-  double tt =0;
-  for (int yy=-k; yy<=k; yy++) {
-    for (int xx=-k; xx<=k; xx++) {
-      double dd = xx*cos(aa)+yy*sin(aa);
-      double ee = xx*sin(aa)-yy*cos(aa);
-      if (dd*dd/(k*k) + ee*ee/(rm*rm)<= 1) {
-	double vv = exp(-(a*xx*xx + 2*b*xx*yy + c*yy*yy));
-	kernel[(yy+k)*kk+(xx+k)] = vv;
-	tt += vv;
-      }
-    }
-  }
-  // normalize kernel
-  if (tt) 
-    for (int ii=0; ii<kk2; ii++)
-      kernel[ii] /= tt;
-
-  //  dumpKernel(kernel, k);
-}
-
-void dumpKernel(double* kernel, int k)
-{
-  int kk = 2*k+1;
-
-  for (int yy=-k; yy<=k; yy++)
-    for (int xx=-k; xx<=k; xx++)
-      cerr << '(' << xx << ',' << yy << ")=" 
-	   << kernel[(yy+k)*kk+(xx+k)] << endl;
-}
diff --git a/tksao/util/smooth.h b/tksao/util/smooth.h
deleted file mode 100644
index 53e66dc..0000000
--- a/tksao/util/smooth.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) 1999-2017
-// Smithsonian Astrophysical Observatory, Cambridge, MA, USA
-// For conditions of distribution and use, see copyright notice in "copyright"
-
-#ifndef __smooth_h__
-#define __smooth_h__
-
-void boxcar(double* kernel, int r);
-void tophat(double* kernel, int r);
-void gaussian(double* kernel, int r, double sigma);
-void elliptic(double* kernel, int r, int m, double ss, double sm, double aa);
-
-#endif
-- 
cgit v0.12