More work on Deep decoding.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7911 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2017-07-16 15:56:06 +00:00
parent 28ec5de9ee
commit 748e359fe0
3 changed files with 9 additions and 7 deletions

View File

@ -236,9 +236,10 @@ subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,iaptype,icand,sync0,f1,xdt,
message=' ' message=' '
xsnr=-99.0 xsnr=-99.0
if(count(cw.eq.0).eq.174) cycle !Reject the all-zero codeword if(count(cw.eq.0).eq.174) cycle !Reject the all-zero codeword
! if( nharderrors.ge.0 .and. dmin.le.30.0 .and. nharderrors .lt. 30) then if(nharderrors.ge.0 .and. nharderrors+dmin.lt.60.0 .and. &
!*** These thresholds should probably be dependent on nap .not.(sync.lt.2.0 .and. nharderrors.gt.35) .and. &
if( nharderrors.ge.0 .and. dmin.le.50.0 .and. nharderrors .lt. 50) then .not.( iap .gt. 0 .and. nharderrors.gt.39) &
) then
call chkcrc12a(decoded,nbadcrc) call chkcrc12a(decoded,nbadcrc)
else else
nharderrors=-1 nharderrors=-1

View File

@ -1,7 +1,8 @@
subroutine sync8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand) subroutine sync8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand)
include 'ft8_params.f90' include 'ft8_params.f90'
parameter (JZ=62) !DT up to +/- 1.25 s ! Search over +/- 2.5s relative to start of interval.
parameter (JZ=62)
complex cx(0:NH1) complex cx(0:NH1)
real s(NH1,NHSYM) real s(NH1,NHSYM)
real savg(NH1) real savg(NH1)
@ -133,7 +134,7 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand)
! do i=ncand,1,-1 ! do i=ncand,1,-1
do i=1,ncand do i=1,ncand
j=indx(i) j=indx(i)
if( candidate0(3,j) .ge. syncmin ) then if( candidate0(3,j) .ge. syncmin .and. candidate0(2,j).ge.-1.5 ) then
candidate(1,k)=abs(candidate0(1,j)) candidate(1,k)=abs(candidate0(1,j))
candidate(2,k)=candidate0(2,j) candidate(2,k)=candidate0(2,j)
candidate(3,k)=candidate0(3,j) candidate(3,k)=candidate0(3,j)

View File

@ -61,10 +61,10 @@ contains
if(ipass.eq.1) then if(ipass.eq.1) then
lsubtract=.true. lsubtract=.true.
if(ndepth.eq.1) lsubtract=.false. if(ndepth.eq.1) lsubtract=.false.
syncmin=1.3 syncmin=1.5
else else
lsubtract=.false. lsubtract=.false.
syncmin=1.3 syncmin=1.5
endif endif
call timer('sync8 ',0) call timer('sync8 ',0)
call sync8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand) call sync8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand)