From c994495382921ce9961ac897d0023e33ed713443 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 11 Sep 2008 15:42:53 +0000 Subject: [PATCH] Remove several disused routines. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1010 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- fil658.f | 50 --------------------------------------------- fil659.f | 59 ------------------------------------------------------ map65.py | 2 +- resample.c | 30 --------------------------- 4 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 fil658.f delete mode 100644 fil659.f delete mode 100644 resample.c diff --git a/fil658.f b/fil658.f deleted file mode 100644 index 04e8cdb49..000000000 --- a/fil658.f +++ /dev/null @@ -1,50 +0,0 @@ - subroutine fil658(c1,n1,c2,n2) - -C FIR lowpass filter designed using ScopeFIR - -C Pass #1 Pass #2 Pass #3 -C----------------------------------------------- -C fsample (Hz) 96000.0 24000 6000 Input sample rate -C Ntaps 47 47 47 Number of filter taps -C fc (Hz) 6000 1500 375 Cutoff frequency (-3 dB) -C fstop (Hz) 11025.0 2756.25 689.0625 Lower limit of stopband -C Ripple (dB) 0.06 0.06 0.06 Ripple in passband -C Stop Atten (dB) 41 41 41 Stopband attenuation -C fout (Hz) 24000.0 6000 1500 Output sample rate - - parameter (NTAPS=47) - parameter (NH=NTAPS/2) - parameter (NDOWN=4) !Downsample ratio = 1/4 - complex c1(n1) - complex c2(n1/NDOWN) - -C Filter coefficients: - real a(-NH:NH) - data a/ - + 0.004066057444,-0.000483030239,-0.002085155775,-0.004036668720, - + -0.005338083014,-0.004952374329,-0.002267639582, 0.002499787691, - + 0.008113543743, 0.012522509052, 0.013441779030, 0.009233544068, - + -0.000256999594,-0.013156485907,-0.025660797518,-0.032755808092, - + -0.029602578877,-0.013013352845, 0.017249853203, 0.057885304099, - + 0.102497204557, 0.142897857652, 0.171067807479, 0.181167084990, - + 0.171067807479, 0.142897857652, 0.102497204557, 0.057885304099, - + 0.017249853203,-0.013013352845,-0.029602578877,-0.032755808092, - + -0.025660797518,-0.013156485907,-0.000256999594, 0.009233544068, - + 0.013441779030, 0.012522509052, 0.008113543743, 0.002499787691, - + -0.002267639582,-0.004952374329,-0.005338083014,-0.004036668720, - + -0.002085155775,-0.000483030239, 0.004066057444/ - - n2=(n1-NTAPS+NDOWN)/NDOWN - k0=NH-NDOWN+1 - -C Loop over all output samples - do i=1,n2 - c2(i)=0. - k=k0 + NDOWN*i - do j=-NH,NH - c2(i)=c2(i) + c1(j+k)*a(j) - enddo - enddo - - return - end diff --git a/fil659.f b/fil659.f deleted file mode 100644 index e588d7831..000000000 --- a/fil659.f +++ /dev/null @@ -1,59 +0,0 @@ - subroutine fil659(id,n1,f0,c2a,c2b,n2) - -C FIR lowpass filter designed using ScopeFIR - -C fsample (Hz) 96000.0 Input sample rate -C Ntaps 23 Number of filter taps -C fc (Hz) 1500 Cutoff frequency (-3 dB) -C fstop (Hz) 12000 Lower limit of stopband -C Ripple (dB) 0.05 Ripple in passband -C Stop Atten (dB) 45 Stopband attenuation -C fout (Hz) 24000.0 Output sample rate - - parameter (NTAPS=23) - parameter (NH=NTAPS/2) - parameter (NDOWN=4) !Downsample ratio = 1/4 - integer*2 id(4,n1) - complex c2a(n1/NDOWN),c2b(n1/NDOWN) - complex z - real*8 dt,dpha,twopi - complex w,w0,wstep - data twopi/6.2831853071796/ - -C Filter coefficients: - real a(-NH:NH) - data a/ - + -0.006192694772,-0.009005098228,-0.011852791893,-0.011064464062, - + -0.004044201520, 0.010987986233, 0.034169891384, 0.063459565756, - + 0.094796253511, 0.122845919676, 0.142302928050, 0.149270332282, - + 0.142302928050, 0.122845919676, 0.094796253511, 0.063459565756, - + 0.034169891384, 0.010987986233,-0.004044201520,-0.011064464062, - + -0.011852791893,-0.009005098228,-0.006192694772/ - - - n2=(n1-NTAPS+NDOWN)/NDOWN - k0=NH-NDOWN+1 - -C Loop over all output samples - dt=1.d0/96000.d0 - dpha=twopi*f0*dt - wstep=cmplx(cos(dpha),sin(dpha)) - k=k0+NDOWN - w0=1.0 - do i=1,n2 - c2a(i)=0. - c2b(i)=0. - k=k0 + NDOWN*i - w=w0 - do j=-NH,NH - w=w*wstep - if(j.eq.3-NH) w0=w - z=a(j)*cmplx(float(int(id(1,j+k))),float(int(id(2,j+k))))*w - c2a(i)=c2a(i) + z - z=a(j)*cmplx(float(int(id(3,j+k))),float(int(id(4,j+k))))*w - c2b(i)=c2b(i) + z - enddo - enddo - - return - end diff --git a/map65.py b/map65.py index 521ab23fe..8f1a50f49 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#---------------------------------------------------------------------- MAP65 +#--------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import * diff --git a/resample.c b/resample.c deleted file mode 100644 index 04f65e34a..000000000 --- a/resample.c +++ /dev/null @@ -1,30 +0,0 @@ -#include -//#ifdef CVF -#include "samplerate.h" -//#else -//#include -//#endif - -int resample_(float din[], int *jzin, int *conv_type, int *channels, - double *samfac, float dout[], int *jzout) -{ - SRC_DATA src_data; - int input_len; - int output_len; - int ierr; - double src_ratio; - - src_ratio=*samfac; - input_len=*jzin; - output_len=(int) (input_len*src_ratio); - - src_data.data_in=din; - src_data.data_out=dout; - src_data.src_ratio=src_ratio; - src_data.input_frames=input_len; - src_data.output_frames=output_len; - - ierr=src_simple(&src_data,*conv_type,*channels); - *jzout=output_len; - return ierr; -}