From 0d93735ba01338bb4ad45eeaccdf2f443c4e1192 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 25 Dec 2005 01:54:28 +0000 Subject: [PATCH] Removed normalization by rms in sync65. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@14 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- spec2d65.f | 2 -- sync65.f | 12 +----------- wsjt.py | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/spec2d65.f b/spec2d65.f index 4095d1ce3..cc1417149 100644 --- a/spec2d65.f +++ b/spec2d65.f @@ -27,8 +27,6 @@ c complex work(NMAX) dt=2.0/11025.0 df=0.5*11025.0/nfft call zero(ps,77) - tmid=0.5*dt*nsym*nfft*mode65 - k=istart-nfft do j=1,nsym call zero(s,77) diff --git a/sync65.f b/sync65.f index 0aab21d1a..6fb2f08b6 100644 --- a/sync65.f +++ b/sync65.f @@ -53,7 +53,6 @@ C Find the best frequency channel for CCF ired1=ib-i0 lag1=-5 -! lag2=27 lag2=59 syncbest=-1.e30 syncbest2=-1.e30 @@ -66,16 +65,7 @@ C Find the best frequency channel for CCF C Find rms of the CCF, without the main peak call slope(ccfblue(lag1),lag2-lag1+1,lagpk0-lag1+1.0) - sq=0. - nsq=0 - do lag=lag1,lag2 - if(abs(lag-lagpk0).gt.1) then - sq=sq+ccfblue(lag)**2 - nsq=nsq+1 - endif - enddo - rms=sqrt(sq/nsq) - sync=abs(ccfblue(lagpk0))/rms + sync=abs(ccfblue(lagpk0)) ppmax=psavg(i)-1.0 C Find the best sync value diff --git a/wsjt.py b/wsjt.py index 76e7c9942..3a001ac1a 100644 --- a/wsjt.py +++ b/wsjt.py @@ -13,7 +13,7 @@ from palettes import colormapblue, colormapgray0, colormapHot, \ colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette root = Tk() -Version="5.9.2.1" +Version="5.9.2 r14" print "******************************************************************" print "WSJT Version " + Version + ", by K1JT" isec=Audio.makedate_sub()