w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 12:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Trying to (somewhat) rationalize use of Fcal and reposted DF values.

Browse Source
This commit is contained in:
Joe Taylor 2021-05-18 14:04:33 -04:00
parent db7d4413e0
commit 919c4e0d22
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
map65/libm65/map65a.f90
View File

@ -215,7 +215,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
if(nqd.eq.1 .and. ntol.le.100) thresh1=0. if(nqd.eq.1 .and. ntol.le.100) thresh1=0.
noffset=0 noffset=0
if(nqd.ge.1) noffset=nint(1000.0*(freq-fqso)-mousedf) if(nqd.ge.1) noffset=nint(1000.0*(freq-fqso)-mousedf)
if(first_loop .and. sync1.gt.0.0) then if(first_loop .and. sync1.gt.-99.0) then
sync1=thresh1+1.0 sync1=thresh1+1.0
noffset=0 noffset=0
first_loop=.false. first_loop=.false.
@ -357,27 +357,35 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
endif endif
enddo ! k=1,km enddo ! k=1,km
if(mode_q65.ge.1) then if(mode_q65.ne.0) then
q65b_called=.false. q65b_called=.false.
do icand=1,ncand do icand=1,ncand
if(cand(icand)%iflip.ne.0) cycle !Keep only Q65 candidates if(cand(icand)%iflip.ne.0) cycle !Keep only Q65 candidates
freq=cand(icand)%f+nkhz_center-48.0-1.27046 freq=cand(icand)%f+nkhz_center-48.0-1.27046
nhzdiff=nint(1000.0*(freq-mousefqso)-mousedf) nhzdiff=nint(1000.0*(freq-mousefqso)-mousedf)
if(nqd.eq.1 .and. abs(nhzdiff).gt.ntol) cycle if(nqd.eq.1 .and. abs(nhzdiff).gt.ntol) cycle
ikhz=nint(freq) ! ikhz=nint(freq)
ikhz=mousefqso
q65b_called=.true. q65b_called=.true.
f0=cand(icand)%f
! write(*,3002) nqd,f0
!3002 format('=A',i3,f10.3)
call timer('q65b ',0) call timer('q65b ',0)
call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, & call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, &
mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,idec) mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,f0,idec)
call timer('q65b ',1) call timer('q65b ',1)
if(idec.ge.0) candec(icand)=.true. if(idec.ge.0) candec(icand)=.true.
enddo enddo
if(.not.q65b_called) then if(.not.q65b_called) then
freq=mousefqso + 0.001*mousedf freq=mousefqso + 0.001*mousedf
ikhz=nint(freq) ! ikhz=nint(freq)
ikhz=mousefqso
f0=freq - (nkhz_center-48.0-1.27046) !### ??? ###
! write(*,3004) nqd,f0
!3004 format('=B',i3,f10.3)
call timer('q65b ',0) call timer('q65b ',0)
call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, & call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, &
mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,idec) mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,f0,idec)
call timer('q65b ',1) call timer('q65b ',1)
endif endif
endif endif
@ -408,11 +416,12 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
freq=cand(icand)%f+nkhz_center-48.0-1.27046 freq=cand(icand)%f+nkhz_center-48.0-1.27046
if(nqd.eq.1 .and. abs(freq-mousefqso).gt.0.001*ntol) cycle if(nqd.eq.1 .and. abs(freq-mousefqso).gt.0.001*ntol) cycle
ikhz=nint(freq) ikhz=nint(freq)
! write(*,3202) nqd,freq,mousefqso,mousedf,ntol f0=cand(icand)%f
!3202 format('=B',i3,f10.3,3i5) ! write(*,3006) nqd,f0
!3006 format('=C',i3,f10.3)
call timer('q65b ',0) call timer('q65b ',0)
call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, & call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, &
mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,idec) mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,f0,idec)
call timer('q65b ',1) call timer('q65b ',1)
if(idec.ge.0) candec(icand)=.true. if(idec.ge.0) candec(icand)=.true.
enddo ! icand enddo ! icand

24
map65/libm65/q65b.f90
View File

@ -1,5 +1,5 @@
subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, & subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
mycall0,hiscall0,hisgrid,mode_q65,idec) mycall0,hiscall0,hisgrid,mode_q65,f0,idec)
! This routine provides an interface between MAP65 and the Q65 decoder ! This routine provides an interface between MAP65 and the Q65 decoder
! in WSJT-X. All arguments are input data obtained from the MAP65 GUI. ! in WSJT-X. All arguments are input data obtained from the MAP65 GUI.
@ -8,7 +8,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
! orthogonal polarization. Decoded messages are sent back to the GUI ! orthogonal polarization. Decoded messages are sent back to the GUI
! on stdout. ! on stdout.
! use wavhdr use wavhdr
use q65_decode use q65_decode
use wideband_sync use wideband_sync
use timer_module, only: timer use timer_module, only: timer
@ -16,7 +16,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
parameter (MAXFFT1=5376000) !56*96000 parameter (MAXFFT1=5376000) !56*96000
parameter (MAXFFT2=336000) !56*6000 (downsampled by 1/16) parameter (MAXFFT2=336000) !56*6000 (downsampled by 1/16)
parameter (NMAX=60*12000) parameter (NMAX=60*12000)
! type(hdr) h !Header for the .wav file type(hdr) h !Header for the .wav file
integer*2 iwave(60*12000) integer*2 iwave(60*12000)
complex ca(MAXFFT1),cb(MAXFFT1) !FFTs of raw x,y data complex ca(MAXFFT1),cb(MAXFFT1) !FFTs of raw x,y data
complex cx(0:MAXFFT2-1),cy(0:MAXFFT2-1),cz(0:MAXFFT2) complex cx(0:MAXFFT2-1),cy(0:MAXFFT2-1),cz(0:MAXFFT2)
@ -42,13 +42,15 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
! Find best frequency and ipol from sync_dat, the "orange sync curve". ! Find best frequency and ipol from sync_dat, the "orange sync curve".
df3=96000.0/32768.0 df3=96000.0/32768.0
ff=ikhz+0.001*(mousedf+nfcal+1270.459) !Supposed freq of sync tone ! ff=ikhz+0.001*(mousedf+nfcal+1270.459) !Supposed freq of sync tone
ifreq=nint(1000.0*(ff-nkhz_center+48)/df3) !Freq index into ss(4,322,32768) ! ifreq=nint(1000.0*(ff-nkhz_center+48)/df3) !Freq index into ss(4,322,32768)
ifreq=nint((1000.0*f0+nfcal)/df3)
ia=nint(ifreq-ntol/df3) ia=nint(ifreq-ntol/df3)
ib=nint(ifreq+ntol/df3) ib=nint(ifreq+ntol/df3)
ipk1=maxloc(sync(ia:ib)%ccfmax) ipk1=maxloc(sync(ia:ib)%ccfmax)
ipk=ia+ipk1(1)-1 ipk=ia+ipk1(1)-1
snr1=sync(ipk)%ccfmax snr1=sync(ipk)%ccfmax
ipol=1 ipol=1
if(xpol) ipol=sync(ipk)%ipol if(xpol) ipol=sync(ipk)%ipol
@ -63,6 +65,9 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
nh=nfft2/2 nh=nfft2/2
k0=nint((ipk*df3-1000.0)/df) k0=nint((ipk*df3-1000.0)/df)
! write(*,3001) nqd,f0+0.001*nfcal,0.001*ipk*df3,0.001*k0*df+1.0,mousedf,ipk,snr1
!3001 format('=D',i3,3f10.3,2i7,f7.2)
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.1.5) go to 900 !### Threshold needs work? ### if(snr1.lt.1.5) go to 900 !### Threshold needs work? ###
@ -109,9 +114,14 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
enddo enddo
iwave(2*nfft2+1:)=0 iwave(2*nfft2+1:)=0
open(30,file='000000_0001.wav',status='unknown',access='stream')
h=default_header(12000,NMAX)
write(30) h,iwave
close(30)
nsubmode=mode_q65-1 nsubmode=mode_q65-1
nfa=max(100,1000-ntol) nfa=max(100,1000-ntol)
nfb=min(4900,1000+ntol) nfb=min(2500,1000+ntol)
newdat=1 newdat=1
nagain=0 nagain=0
nsnr0=-99 !Default snr for no decode nsnr0=-99 !Default snr for no decode
@ -124,7 +134,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
freq0=MHz + 0.001*ikhz freq0=MHz + 0.001*ikhz
if(nsnr0.gt.-99) then if(nsnr0.gt.-99) then
nq65df=nint(1000*(0.001*k0*df+nkhz_center-48.0+1.000-1.27046-ikhz))-nfcal nq65df=nint(1000*(0.001*k0*df+nkhz_center-48.0+1.000-1.27046-ikhz))-nfcal
if(nqd.eq.1) then if(nqd.eq.1 .and. abs(nfreq0-1000.0).lt.0.9*ntol) then
write(line,1020) ikhz,nq65df,45*(ipol-1),nutc,xdt0,nsnr0,msg0(1:27),cq0 write(line,1020) ikhz,nq65df,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)
write(*,1100) trim(line) write(*,1100) trim(line)