From 3467ee7924303f7043e25c6ecc5cc35fe87b2e24 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Fri, 6 Mar 2020 11:54:28 -0600 Subject: [PATCH] Make Normal decode the same as Deep except no DT refinement at nearly=47. --- lib/ft8/ft8b.f90 | 2 +- lib/ft8_decode.f90 | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/ft8/ft8b.f90 b/lib/ft8/ft8b.f90 index fe5cecc3a..de13461a9 100644 --- a/lib/ft8/ft8b.f90 +++ b/lib/ft8/ft8b.f90 @@ -405,7 +405,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,nzhsym,lapon, & niterations) call timer('bpd174_91 ',1) dmin=0.0 - if(ndepth.eq.3 .and. nharderrors.lt.0) then + if(ndepth.ge.2 .and. nharderrors.lt.0) then ndeep=3 if(abs(nfqso-f1).le.napwid .or. abs(nftx-f1).le.napwid .or. ncontest.eq.7) then ndeep=4 diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 5431c78cd..012794958 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -46,7 +46,7 @@ contains real candidate(3,MAXCAND) real dd(15*12000),dd1(15*12000) logical, intent(in) :: lft8apon,lapcqonly,nagain - logical newdat,lsubtract,ldupe + logical newdat,lsubtract,ldupe,lrefinedt logical lsubtracted(MAX_EARLY) character*12 mycall12,hiscall12 character*6 hisgrid6 @@ -77,10 +77,12 @@ contains endif if(nzhsym.eq.47 .and. ndec_early.ge.1) then lsubtracted=.false. + lrefinedt=.true. + if(ndepth.le.2) lrefinedt=.false. call timer('sub_ft8b',0) do i=1,ndec_early if(xdt_save(i)-0.5.lt.0.396) then - call subtractft8(dd,itone_save(1,i),f1_save(i),xdt_save(i),.true.) + call subtractft8(dd,itone_save(1,i),f1_save(i),xdt_save(i),lrefinedt) lsubtracted(i)=.true. endif enddo @@ -108,7 +110,7 @@ contains ! For now: ! ndepth=1: no subtraction, 1 pass, belief propagation only -! ndepth=2: subtraction, 3 passes, belief propagation only +! ndepth=2: subtraction, 3 passes, bp+osd (no subtract refinement) ! ndepth=3: subtraction, 3 passes, bp+osd if(ndepth.eq.1) npass=1 if(ndepth.ge.2) npass=3