Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0

This commit is contained in:
Joe Taylor 2019-06-12 11:34:41 -04:00
commit 7e1eaf3f31
2 changed files with 4 additions and 3 deletions

View File

@ -1,4 +1,4 @@
subroutine get_ft4_bitmetrics(cd,smax,bitmetrics,badsync)
subroutine get_ft4_bitmetrics(cd,bitmetrics,badsync)
include 'ft4_params.f90'
parameter (NSS=NSPS/NDOWN,NDMAX=NMAX/NDOWN)
@ -58,7 +58,7 @@ subroutine get_ft4_bitmetrics(cd,smax,bitmetrics,badsync)
if(icos4d(k-1).eq.(ip(1)-1)) is4=is4+1
enddo
nsync=is1+is2+is3+is4 !Number of correct hard sync symbols, 0-16
if(smax .lt. 0.7 .or. nsync .lt. 8) then
if(nsync .lt. 8) then
badsync=.true.
return
endif

View File

@ -269,6 +269,7 @@ contains
enddo
call timer('sync4d ',1)
enddo
if(smax.lt.0.7) cycle
f0=f0+real(idfbest)
if( f0.le.10.0 .or. f0.ge.4990.0 ) cycle
call timer('ft4down ',0)
@ -286,7 +287,7 @@ contains
endif
call timer('bitmet ',0)
call get_ft4_bitmetrics(cd,smax,bitmetrics,badsync)
call get_ft4_bitmetrics(cd,bitmetrics,badsync)
call timer('bitmet ',1)
if(badsync) cycle