Improved behavior with smaller values of F Tol.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6962 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-07-28 17:27:47 +00:00
parent e432dc421a
commit f3d62edb2e
2 changed files with 11 additions and 10 deletions

View File

@ -17,8 +17,6 @@ subroutine spec64(c0,npts2,mode64,jpk,s3a)
fsample=4000.0/ndown
df=fsample/nfft6
jpkd=nint(float(jpk)/ndown)
! write(*,3001) mode64,ndown,nfft6,fsample,df
!3001 format(i2,i3,i7,f7.1,f8.3)
do j=1,63
jj=j+7 !Skip first Costas array
if(j.ge.32) jj=j+14 !Skip middle Costas array

View File

@ -8,7 +8,8 @@ subroutine sync64(dd,nf1,nf2,nfqso,ntol,mode64,maxf1,dtx,f0,jpk,kpk,snrdb,c0)
real s2(0:NSPC-1) !Power spectrum of Costas 2
real s3(0:NSPC-1) !Power spectrum of Costas 3
real s0(0:NSPC-1) !Sum of s1+s2+s3
real s0a(0:NSPC-1) !Best synchromized spectrum
real s0a(0:NSPC-1) !Best synchromized spectrum (saved)
real s0b(0:NSPC-1) !tmp
real a(5)
integer icos7(0:6) !Costas 7x7 tones
integer ipk0(1)
@ -87,13 +88,15 @@ subroutine sync64(dd,nf1,nf2,nfqso,ntol,mode64,maxf1,dtx,f0,jpk,kpk,snrdb,c0)
s3(i)=real(c3(i))**2 + aimag(c3(i))**2
enddo
do k=ka,kb
s0(ia:ib)=s1(ia-k:ib-k) + s2(ia:ib) + s3(ia+k:ib+k)
!###
do nn=1,mode64
call smo121(s0(ia:ib),iz)
enddo
!###
call averms(s0(ia:ib),iz,14,ave,rms)
s0b(ia:ib)=s1(ia-k:ib-k) + s2(ia:ib) + s3(ia+k:ib+k)
s0b(:ia-1)=0.
s0b(ib+1:)=0.
nadd=(7*mode64)/2
if(mod(nadd,2).eq.1) nadd=nadd+1 !Make nadd odd
if(nadd.ge.3) call smo(s0b(ia:ib),iz,s0(ia:ib),nadd)
call smo121(s0(ia:ib),iz)
nskip=max(14,2*mode64)
call averms(s0(ia:ib),iz,nskip,ave,rms)
s=(maxval(s0(ia:ib))-ave)/rms
if(s.gt.snr) then
jpk=j1