From 3b2a918eb05b6a0523a3da225f0c29dff8d24225 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 12 Apr 2016 14:24:55 +0000 Subject: [PATCH] Rationalize the "NTol" usage in JT65 single-decode modes. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6614 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/jt65_decode.f90 | 5 +++-- lib/sync65.f90 | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/jt65_decode.f90 b/lib/jt65_decode.f90 index 39baf9e5c..b9ee856ff 100644 --- a/lib/jt65_decode.f90 +++ b/lib/jt65_decode.f90 @@ -126,8 +126,8 @@ contains endif df=12000.0/8192.0 !df = 1.465 Hz if(single_decode) then - ia=max(1,nint(nfa/df)-100) - ib=min(NSZ,nint(nfb/df)+100) + ia=max(1,nint(nfa/df)-ntol) + ib=min(NSZ,nint(nfb/df)+ntol) nz=ib-ia+1 call lorentzian(savg(ia),nz,a) baseline=a(1) @@ -145,6 +145,7 @@ contains call timer('sync65 ',0) call sync65(ss,nfa,nfb,naggressive,ntol,nhsym,ca,ncand,0, & single_decode) + call timer('sync65 ',1) endif if(ncand.gt.50) robust=.true. diff --git a/lib/sync65.f90 b/lib/sync65.f90 index f6a5c033c..7e60d5fc4 100644 --- a/lib/sync65.f90 +++ b/lib/sync65.f90 @@ -49,7 +49,8 @@ subroutine sync65(ss,nfa,nfb,naggressive,ntol,nhsym,ca,ncand,nrobust, & do i=ia,ib freq=i*df itry=0 - if(naggressive.gt.0 .and. ntol.lt.1000 .and. ccfmax.ge.thresh0) then +! if(naggressive.gt.0 .and. ntol.lt.1000 .and. ccfmax.ge.thresh0) then + if(naggressive.gt.0 .and. ccfmax.ge.thresh0) then if(i.ne.ipk) cycle itry=1 ncand=ncand+1