w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-30 09:06:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sync8.f90 more robust. Increase number of candidates to 300.

Browse Source
This commit is contained in:
Steve Franke 2018-08-08 09:29:08 -05:00
parent 47078e997f
commit 20cfae891e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ft8/sync8.f90
View File

@ -1,4 +1,4 @@
subroutine sync8(dd,nfa,nfb,syncmin,nfqso,ldecode77,s,candidate,ncand,sbase) subroutine sync8(dd,nfa,nfb,syncmin,nfqso,ldecode77,maxcand,s,candidate,ncand,sbase)
include 'ft8_params.f90' include 'ft8_params.f90'
! Search over +/- 2.5s relative to 0.5s TX start time. ! Search over +/- 2.5s relative to 0.5s TX start time.
@ -11,8 +11,8 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,ldecode77,s,candidate,ncand,sbase)
real x(NFFT1) real x(NFFT1)
real sync2d(NH1,-JZ:JZ) real sync2d(NH1,-JZ:JZ)
real red(NH1) real red(NH1)
real candidate0(4,200) real candidate0(4,maxcand)
real candidate(4,200) real candidate(4,maxcand)
real dd(NMAX) real dd(NMAX)
integer jpeak(NH1) integer jpeak(NH1)
integer indx(NH1) integer indx(NH1)
@ -108,10 +108,10 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,ldecode77,s,candidate,ncand,sbase)
base=red(ibase) base=red(ibase)
red=red/base red=red/base
do i=1,200 do i=1,min(maxcand,iz)
n=ia + indx(iz+1-i) - 1 n=ia + indx(iz+1-i) - 1
if(red(n).lt.syncmin) exit if(red(n).lt.syncmin.or.isnan(red(n)).or.k.eq.maxcand) exit
if(k.lt.200) k=k+1 k=k+1
candidate0(1,k)=n*df candidate0(1,k)=n*df
candidate0(2,k)=(jpeak(n)-1)*tstep candidate0(2,k)=(jpeak(n)-1)*tstep
candidate0(3,k)=red(n) candidate0(3,k)=red(n)
@ -151,7 +151,6 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,ldecode77,s,candidate,ncand,sbase)
candidate(2,k)=candidate0(2,j) candidate(2,k)=candidate0(2,j)
candidate(3,k)=candidate0(3,j) candidate(3,k)=candidate0(3,j)
candidate(4,k)=candidate0(4,j) candidate(4,k)=candidate0(4,j)
!write(*,*) i,candidate(1:4,k)
k=k+1 k=k+1
endif endif
enddo enddo

3
lib/ft8_decode.f90
View File

@ -102,7 +102,8 @@ contains
lsubtract=.false. lsubtract=.false.
endif endif
call timer('sync8 ',0) call timer('sync8 ',0)
call sync8(dd,ifa,ifb,syncmin,nfqso,ldecode77,s,candidate,ncand,sbase) maxcand=300
call sync8(dd,ifa,ifb,syncmin,nfqso,ldecode77,maxcand,s,candidate,ncand,sbase)
call timer('sync8 ',1) call timer('sync8 ',1)
do icand=1,ncand do icand=1,ncand
sync=candidate(3,icand) sync=candidate(3,icand)