From 9621999d5209482376b7801513876ee1d47d7318 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 25 Jul 2006 13:12:03 +0000 Subject: [PATCH] Another tweak to parameters in Deep Search algorithm. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@207 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- deep65.F | 13 ++++++------- wsjt.py | 2 +- wsjt65.f | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/deep65.F b/deep65.F index 8bfa267a5..4ec284660 100644 --- a/deep65.F +++ b/deep65.F @@ -136,21 +136,20 @@ C If sync=OOO, no CQ messages if(pp(ntot-i).ne.pp(ntot)) go to 40 enddo - 40 qual=100.0*(p1-1.08*pp(ntot-i)) - if(mode65.eq.1) qual=100.0*(p1-1.12*pp(ntot-i)) - if(mode65.eq.4) qual=100.0*(p1-1.04*pp(ntot-i)) -! if(mode65.eq.1) qual=100.0*(p1-0.335) -! if(mode65.eq.4) qual=100.0*(p1-0.505) + 40 if(mode65.eq.1) bias=max(1.12*pp(ntot-i),0.335) + if(mode65.eq.2) bias=max(1.08*pp(ntot-i),0.405) + if(mode65.eq.4) bias=max(1.04*pp(ntot-i),0.505) + qual=100.0*(p1-bias) decoded=' ' c=' ' if(qual.gt.1.0) then if(qual.lt.6.0) c='?' decoded=testmsg(ip1) + else + qual=0. endif decoded(22:22)=c - if(qual.lt.0.) qual=0. - if(qual.gt.10.) qual=10. return end diff --git a/wsjt.py b/wsjt.py index e2a3a21af..7b9ddc350 100644 --- a/wsjt.py +++ b/wsjt.py @@ -1,4 +1,4 @@ -#------------------------------------------------------------------- WSJT +#------------------------------------------------------------------ WSJT from Tkinter import * from tkFileDialog import * import Pmw diff --git a/wsjt65.f b/wsjt65.f index 6f8cd14d2..738223f0e 100644 --- a/wsjt65.f +++ b/wsjt65.f @@ -149,7 +149,7 @@ C result from the Reed-Solomon decoder. 200 continue kvqual=0 if(ncount.ge.0) kvqual=1 - nqual=qbest + nqual=min(qbest,10.0) if(nqual.ge.nq1 .and.kvqual.eq.0) then dtx=dtbest dfx=dfbest