From 94da7afa83c614a8c24ad1529f65953041450240 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 3 Aug 2006 01:52:58 +0000 Subject: [PATCH] Oops! Put if() in the wrong place for the JT6M DF test. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@235 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- wsjt.py | 2 +- wsjt1.F | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/wsjt.py b/wsjt.py index 0f84a33ed..a6844ddb3 100644 --- a/wsjt.py +++ b/wsjt.py @@ -1,4 +1,4 @@ -#------------------------------------------------------------------- WSJT +#------------------------------------------------------------------ WSJT from Tkinter import * from tkFileDialog import * diff --git a/wsjt1.F b/wsjt1.F index 71c4213d6..05c0e62bd 100644 --- a/wsjt1.F +++ b/wsjt1.F @@ -223,8 +223,6 @@ C Intentionally degrade SNR by -nclip dB. call syncf0(dat,jz,NFreeze,DFTolerance,jstart,f0,smax) call synct(dat,jz,jstart,f0,smax) call syncf1(dat,jz,jstart,f0,NFreeze,DFTolerance,smax,red) - if(NFreeze.gt.0 .and. abs(f0-f00).gt.float(DFTolerance)) - + go to 800 f0a=f0 do i=1,512 @@ -247,8 +245,14 @@ C Intentionally degrade SNR by -nclip dB. jz=jz-jstart+1 nslim=MinSigdB NFixLen=0 - call decode6m(dat(jstart),jz,cfile6,nslim,istart, - + NFixLen,lcum,f0,lumsg,npkept,yellow) + +C Call the decoder if DF is in range or Freeze is off. + if(NFreeze.eq.0 .or. + + abs(f0-f00).lt.float(DFTolerance)) then + call decode6m(dat(jstart),jz,cfile6,nslim,istart, + + NFixLen,lcum,f0,lumsg,npkept,yellow) + endif + if(npkept.eq.0) f0a=0. if(pick) then