From efa907b9d024b08d209607f2f0e8f925b889f77a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 24 Oct 2007 19:10:35 +0000 Subject: [PATCH] Fixed quick-decode detection of shorthand messages when Tol is low. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@561 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- map65.py | 2 +- map65a.F90 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/map65.py b/map65.py index 128a002be..7966d1b68 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#--------------------------------------------------------------------- MAP65 +#---------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import * diff --git a/map65a.F90 b/map65a.F90 index 7d4913753..6d04e1889 100644 --- a/map65a.F90 +++ b/map65a.F90 @@ -62,7 +62,7 @@ subroutine map65a(newdat) do nqd=1,0,-1 if(nqd.eq.1) then !Quick decode, at fQSO fa=1000.0*(fselect+0.001*mousedf-100.0) - dftolerance - fb=1000.0*(fselect+0.001*mousedf-100.0) + dftolerance + fb=1000.0*(fselect+0.001*mousedf-100.0) + dftolerance + 4*53.8330078 ia=nint((fa+23000.0)/df + 1.0) ! 23000 = 48000 - 25000 ib=nint((fb+23000.0)/df + 1.0) else !Wideband decode at all freqs @@ -133,7 +133,7 @@ subroutine map65a(newdat) ! Keep only the best candidate within ftol. !### NB: sync2 was not defined here! -!### sync2=syncshort !### try this ??? + sync2=syncshort !### try this ??? if(fshort-fshort0.le.ftol .and. sync2.gt.sync20 & .and. nkm.eq.2) km=km-1 if(fshort-fshort0.gt.ftol .or. & @@ -169,7 +169,7 @@ subroutine map65a(newdat) ! ########################### Search for Normal Messages ########### ! Is sync1 above threshold? thresh1=1.0 - if(nqd.eq.1 .and. dftolerance.le.100) thresh1=0. !Lower threshold at fQSO + if(nqd.eq.1 .and. dftolerance.le.100) thresh1=0. !Lower thresh1 at fQSO if(sync1.gt.thresh1) then ! Keep only the best candidate within ftol.