w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 21:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correct a flaw in setting the target f0 in q65b.

Browse Source
This commit is contained in:
Joe Taylor 2021-05-08 13:58:43 -04:00
parent ed957a0390
commit 356946d9ab
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
map65/libm65/q65b.f90
View File

@ -41,16 +41,16 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
if(hisgrid(1:4).ne.' ') grid4=hisgrid(1:4) if(hisgrid(1:4).ne.' ') grid4=hisgrid(1:4)
! Find best frequency and ipol from sync_dat, the "orange sync curve". ! Find best frequency and ipol from sync_dat, the "orange sync curve".
ff=ikhz+0.001*(mousedf+nfcal+1270.459) !supposed freq of sync tone df3=96000.0/32768.0
ifreq=nint(1000.0*(ff-nkhz_center+48)*32768.0/96000.0) !Freq index into ss(4,322,32768) ff=ikhz+0.001*(mousedf+nfcal+1270.459) !Supposed freq of sync tone
dff=96000.0/32768.0 ifreq=nint(1000.0*(ff-nkhz_center+48)/df3) !Freq index into ss(4,322,32768)
ia=nint(ifreq-ntol/dff) ia=nint(ifreq-ntol/df3)
ib=nint(ifreq+ntol/dff) ib=nint(ifreq+ntol/df3)
ipk1=maxloc(sync_dat(ia:ib,2)) ipk1=maxloc(sync_dat(ia:ib,2))
ipk=ia+ipk1(1)-1 ipk=ia+ipk1(1)-1
ipol=1 ipol=1
if(xpol) ipol=nint(sync_dat(ipk,4)) if(xpol) ipol=nint(sync_dat(ipk,4))
nhz=nint((ipk-ifreq)*dff) nhz=nint((ipk-ifreq)*df3)
snr1=sync_dat(ipk,2) snr1=sync_dat(ipk,2)
nfft1=MAXFFT1 nfft1=MAXFFT1
@ -63,9 +63,8 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
endif endif
nh=nfft2/2 nh=nfft2/2
ikhz0=nint(1000.0*(fcenter-int(fcenter))) ikhz0=nint(1000.0*(fcenter-int(fcenter)))
! k0=(1000*(ikhz-ikhz0+48.0) + 1270 - 1000 + nfcal + mousedf + nhz)/df k0=nint((ipk*df3-1000.0)/df)
k0=nint((ipk*dff-1000.0)/df)
! print*,'#',snr1,ipk*dff,k0*df
if(k0.lt.nh .or. k0.gt.nfft1-nh) go to 900 if(k0.lt.nh .or. k0.gt.nfft1-nh) go to 900
if(snr1.lt.2.0) go to 900 if(snr1.lt.2.0) go to 900
@ -127,15 +126,13 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
nsnr0=-99 !Default snr for no decode nsnr0=-99 !Default snr for no decode
call timer('mmdec ',0) call timer('mmdec ',0)
call map65_mmdec(nutc,iwave,nsubmode,nfa,nfb,1000+mousedf,ntol, & ! NB: Frequency of ipk is now shifted to 1000 Hz.
call map65_mmdec(nutc,iwave,nsubmode,nfa,nfb,1000,ntol, &
newdat,nagain,mycall,hiscall,hisgrid) newdat,nagain,mycall,hiscall,hisgrid)
call timer('mmdec ',1) call timer('mmdec ',1)
nfreq=nfreq0 + nhz + mousedf - 1000 nfreq=nfreq0 + nhz + mousedf - 1000
freq0=144.0 + 0.001*ikhz freq0=144.0 + 0.001*ikhz
! write(*,3001) nfa,nfb,mousedf,ntol,newdat,nagain,nhz,nsnr0, &
! 0.001*ipk*dff,0.001*ifreq*dff,0.001*k0*df
!3001 format('#',8i5,3f10.4)
if(nsnr0.gt.-99) then if(nsnr0.gt.-99) then
write(line,1020) ikhz,nfreq,45*(ipol-1),nutc,xdt0,nsnr0,msg0(1:27),cq0 write(line,1020) ikhz,nfreq,45*(ipol-1),nutc,xdt0,nsnr0,msg0(1:27),cq0
1020 format('!',i3.3,i5,i4,i6.4,f5.1,i5,' : ',a27,a3) 1020 format('!',i3.3,i5,i4,i6.4,f5.1,i5,' : ',a27,a3)