w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-31 05:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks to FT8 decoder, remove some debug print statements.

Browse Source
This commit is contained in:
Steven Franke 2022-11-08 20:43:42 -06:00
parent d789beaa82
commit d52621b928
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ft8/sync8.f90
View File

@ -73,10 +73,6 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,nzhsym,candidate, &
t0c=t0c + sum(s(i:i+nfos*6:nfos,m+nssy*72)) t0c=t0c + sum(s(i:i+nfos*6:nfos,m+nssy*72))
endif endif
enddo enddo
t=ta+tb
t0=t0a+t0b
t0=(t0-t)/6.0
sync_ab=t/t0
t=ta+tb+tc t=ta+tb+tc
t0=t0a+t0b+t0c t0=t0a+t0b+t0c
t0=(t0-t)/6.0 t0=(t0-t)/6.0
@ -85,14 +81,7 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,nzhsym,candidate, &
t0=t0b+t0c t0=t0b+t0c
t0=(t0-t)/6.0 t0=(t0-t)/6.0
sync_bc=t/t0 sync_bc=t/t0
if(j.le.-12) then sync2d(i,j)=max(sync_abc,sync_bc)
sync2d(i,j)=sync_bc
elseif(j.gt.-12 .and. j.lt. 49) then
if(nzhsym.eq.41) sync2d(i,j)=sync_ab
if(nzhsym.eq.50) sync2d(i,j)=max(sync_abc,sync_bc)
elseif(j.ge.49) then
sync2d(i,j)=sync_ab
endif
enddo enddo
enddo enddo

12
lib/ft8_decode.f90
View File

@ -44,7 +44,7 @@ contains
class(ft8_decoder), intent(inout) :: this class(ft8_decoder), intent(inout) :: this
procedure(ft8_decode_callback) :: callback procedure(ft8_decode_callback) :: callback
parameter (MAXCAND=500,MAX_EARLY=100) parameter (MAXCAND=600,MAX_EARLY=100)
real*8 tsec,tseq real*8 tsec,tseq
real s(NH1,NHSYM) real s(NH1,NHSYM)
real sbase(NH1) real sbase(NH1)
@ -109,6 +109,7 @@ contains
dd=iwave dd=iwave
dd1=dd dd1=dd
endif endif
if(nzhsym.eq.41) then if(nzhsym.eq.41) then
ndecodes=0 ndecodes=0
allmessages=' ' allmessages=' '
@ -116,10 +117,12 @@ contains
else else
ndecodes=ndec_early ndecodes=ndec_early
endif endif
if(nzhsym.eq.47 .and. ndec_early.eq.0) then if(nzhsym.eq.47 .and. ndec_early.eq.0) then
dd1=dd dd1=dd
go to 800 go to 800
endif endif
if(nzhsym.eq.47 .and. ndec_early.ge.1) then if(nzhsym.eq.47 .and. ndec_early.ge.1) then
lsubtracted=.false. lsubtracted=.false.
lrefinedt=.true. lrefinedt=.true.
@ -142,6 +145,7 @@ contains
dd1=dd dd1=dd
go to 900 go to 900
endif endif
if(nzhsym.eq.50 .and. ndec_early.ge.1 .and. .not.nagain) then if(nzhsym.eq.50 .and. ndec_early.ge.1 .and. .not.nagain) then
n=47*3456 n=47*3456
dd(1:n)=dd1(1:n) dd(1:n)=dd1(1:n)
@ -153,6 +157,7 @@ contains
enddo enddo
call timer('sub_ft8c',1) call timer('sub_ft8c',1)
endif endif
ifa=nfa ifa=nfa
ifb=nfb ifb=nfb
if(nzhsym.eq.50 .and. nagain) then if(nzhsym.eq.50 .and. nagain) then
@ -171,7 +176,6 @@ contains
newdat=.true. newdat=.true.
syncmin=1.3 syncmin=1.3
if(ndepth.le.2) syncmin=1.6 if(ndepth.le.2) syncmin=1.6
! if(nzhsym.eq.41.or.ipass.eq.1) syncmin=2.0
if(nzhsym.eq.41) syncmin=2.0 if(nzhsym.eq.41) syncmin=2.0
if(ipass.eq.1) then if(ipass.eq.1) then
lsubtract=.true. lsubtract=.true.
@ -225,10 +229,6 @@ contains
if(emedelay.ne.0) xdt=xdt+2.0 if(emedelay.ne.0) xdt=xdt+2.0
call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual) call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual)
call ft8_a7_save(nutc,xdt,f1,msg37) !Enter decode in table call ft8_a7_save(nutc,xdt,f1,msg37) !Enter decode in table
! ii=ndec(jseq,1)
! write(41,3041) jseq,ii,nint(f0(ii,jseq,0)),msg0(ii,jseq,0)(1:22),&
! nint(f0(ii,jseq,1)),msg0(ii,jseq,1)(1:22)
!3041 format(3i5,2x,a22,i5,2x,a22)
endif endif
endif endif
call timestamp(tsec,tseq,ctime) call timestamp(tsec,tseq,ctime)