From fb60ec0be5c8fb5d2cfa741cb787285c12fe2080 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 9 Jun 2020 09:38:48 -0500 Subject: [PATCH] FT8: Make the Fast decode setting Faster. --- lib/ft8/ft8b.f90 | 10 ++++------ lib/ft8_decode.f90 | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/ft8/ft8b.f90 b/lib/ft8/ft8b.f90 index e6a3e8d34..08a49783f 100644 --- a/lib/ft8/ft8b.f90 +++ b/lib/ft8/ft8b.f90 @@ -403,14 +403,12 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,nzhsym,lapon, & dmin=0.0 norder=2 maxosd=2 - if(ndepth.lt.3) maxosd=1 - if(abs(nfqso-f1).le.napwid .or. abs(nftx-f1).le.napwid .or. ncontest.eq.7) then + if(ndepth.eq.2) maxosd=1 + if(ndepth.eq.1) maxosd=-1 + if(ndepth.ge.2 .and. & + (abs(nfqso-f1).le.napwid .or. abs(nftx-f1).le.napwid .or. ncontest.eq.7)) then maxosd=2 endif - if(nagain) then - norder=3 - maxosd=1 - endif call timer('dec174_91 ',0) Keff=91 call decode174_91(llrz,Keff,maxosd,norder,apmask,message91,cw, & diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 7feb5b783..9350e8bc7 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -132,6 +132,7 @@ contains ! ndepth=2: subtraction, 3 passes, bp+osd (no subtract refinement) ! ndepth=3: subtraction, 3 passes, bp+osd npass=3 + if(ndepth.eq.1) npass=2 do ipass=1,npass newdat=.true. syncmin=1.3 @@ -148,7 +149,7 @@ contains elseif(ipass.eq.3) then if((ndecodes-n2).eq.0) cycle lsubtract=.true. - ndeep=3 + ndeep=ndepth endif call timer('sync8 ',0) maxc=MAXCAND