Work in progress on wideband decoding.

This commit is contained in:
Joe Taylor 2021-05-13 11:24:26 -04:00
parent a323c6ec65
commit 32ad0bec38
6 changed files with 197 additions and 296 deletions

View File

@ -1,6 +1,6 @@
set (libm65_FSRCS set (libm65_FSRCS
# Modules come first: # Modules come first:
wideband2_sync.f90 wideband_sync.f90
# Non-module Fortran routines: # Non-module Fortran routines:
afc65b.f90 afc65b.f90

View File

@ -5,7 +5,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
! Processes timf2 data from Linrad to find and decode JT65 signals. ! Processes timf2 data from Linrad to find and decode JT65 signals.
use wideband2_sync use wideband_sync
use timer_module, only: timer use timer_module, only: timer
parameter (MAXMSG=1000) !Size of decoded message list parameter (MAXMSG=1000) !Size of decoded message list
@ -47,15 +47,14 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
call get_candidates(ss,savg,mfa,mfb,nts_jt65,nts_q65,cand,ncand) call get_candidates(ss,savg,mfa,mfb,nts_jt65,nts_q65,cand,ncand)
call timer('get_cand',1) call timer('get_cand',1)
endif endif
!### !###
! print*,'=',nagain ! print*,'=',nagain
! do k=1,ncand do k=1,ncand
! freq=cand(k)%f+77.0-1.27046 freq=cand(k)%f+77.0-1.27046
! write(*,3010) nutc,k,cand(k)%snr,cand(k)%f,freq,cand(k)%xdt, & write(*,3010) nutc,k,cand(k)%snr,cand(k)%f,freq,cand(k)%xdt, &
! cand(k)%ipol,cand(k)%iflip cand(k)%ipol,cand(k)%iflip
!3010 format('= ',i4.4,i5,f10.1,3f10.3,2i3) 3010 format('= ',i4.4,i5,f10.1,3f10.3,2i3)
! enddo enddo
! print*,'AAA',nfa,nfb,ncand ! print*,'AAA',nfa,nfb,ncand
!### !###

View File

@ -10,7 +10,7 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
! use wavhdr ! use wavhdr
use q65_decode use q65_decode
use wideband2_sync use wideband_sync
use timer_module, only: timer use timer_module, only: timer
parameter (MAXFFT1=5376000) !56*96000 parameter (MAXFFT1=5376000) !56*96000

View File

@ -2,11 +2,11 @@ program synctest
! Program to test an algorithm for detecting sync signals for both ! Program to test an algorithm for detecting sync signals for both
! JT65 and Q65-60x signals and rejecting birdies in MAP65 data. ! JT65 and Q65-60x signals and rejecting birdies in MAP65 data.
! The important work is done in module wideband2_sync. ! The important work is done in module wideband_sync.
use timer_module, only: timer use timer_module, only: timer
use timer_impl, only: init_timer, fini_timer use timer_impl, only: init_timer, fini_timer
use wideband2_sync use wideband_sync
real ss(4,322,NFFT),savg(4,NFFT) real ss(4,322,NFFT),savg(4,NFFT)
! real candidate(MAX_CANDIDATES,5) !snr1,f0,xdt0,ipol,flip ! real candidate(MAX_CANDIDATES,5) !snr1,f0,xdt0,ipol,flip

View File

@ -1,231 +0,0 @@
module wideband2_sync
type candidate
real :: snr !Relative S/N of sync detection
real :: f !Freq of sync tone, 0 to 96000 Hz
real :: xdt !DT of matching sync pattern, -1.0 to +4.0 s
integer :: ipol !Polarization angle, 1 to 4 ==> 0, 45, 90, 135 deg
integer :: iflip !Sync type: JT65 = +/- 1, Q65 = 0
end type candidate
type sync_dat
real :: ccfmax
real :: xdt
integer :: ipol
integer :: iflip
logical :: birdie
end type sync_dat
parameter (NFFT=32768)
parameter (MAX_CANDIDATES=20)
type(sync_dat) :: sync(NFFT)
integer nkhz_center
contains
subroutine get_candidates(ss,savg,nfa,nfb,nts_jt65,nts_q65,cand,ncand)
! Search symbol spectra ss() over frequency range nfa to nfb (in kHz) for
! JT65 and Q65 sync patterns. The nts_* variables are the submode tone
! spacings: 1 2 4 8 16 for A B C D E. Birdies are detected and
! excised. Candidates are returned in the structure array cand().
parameter (MAX_PEAKS=300)
real ss(4,322,NFFT),savg(4,NFFT)
real pavg(-20:20)
integer indx(NFFT)
logical skip
type(candidate) :: cand(MAX_CANDIDATES)
do j=322,1,-1 !Find end of data in ss()
if(sum(ss(1,j,1:NFFT)).gt.0.0) exit
enddo
jz=j
call wb2_sync(ss,savg,jz,nfa,nfb)
tstep=2048.0/11025.0 !0.185760 s: 0.5*tsym_jt65, 0.3096*tsym_q65
df3=96000.0/NFFT
ia=nint(1000*nfa/df3) + 1
ib=nint(1000*nfb/df3) + 1
iz=ib-ia+1
call indexx(sync(ia:ib)%ccfmax,iz,indx) !Sort by relative snr
k=0
do i=1,MAX_PEAKS
n=indx(iz+1-i) + ia - 1
f0=0.001*(n-1)*df3
snr1=sync(n)%ccfmax
! print*,'=',f0,snr1
if(snr1.lt.4.5) exit
flip=sync(n)%iflip
if(flip.ne.0.0 .and. nts_jt65.eq.0) cycle
if(flip.eq.0.0 .and. nts_q65.eq.0) cycle
if(sync(n)%birdie) cycle
! Test for signal outside of TxT range and set bw for this signal type
j1=(sync(n)%xdt + 1.0)/tstep - 1.0
j2=(sync(n)%xdt + 52.0)/tstep + 1.0
if(flip.ne.0) j2=(sync(n)%xdt + 47.811)/tstep + 1.0
ipol=sync(n)%ipol
pavg=0.
do j=1,j1
pavg=pavg + ss(ipol,j,n-20:n+20)
enddo
do j=j2,jz
pavg=pavg + ss(ipol,j,n-20:n+20)
enddo
jsum=j1 + (jz-j2+1)
pmax=maxval(pavg(-2:2)) !### Why not just pavg(0) ?
base=(sum(pavg)-pmax)/jsum
pmax=pmax/base
if(pmax.gt.5.0) cycle
skip=.false.
do m=1,k !Skip false syncs within signal bw
diffhz=1000.0*(f0-cand(m)%f)
bw=nts_q65*108.0
if(cand(m)%iflip.ne.0) bw=nts_jt65*178.0
if(diffhz.gt.-20.0 .and. diffhz.lt.bw) skip=.true.
! write(*,3301) i,k,m,f0,cand(m)%f,diffhz,snr1,skip
!3301 format('=',3i5,f10.1,3f10.3,L3)
enddo
if(skip) cycle
k=k+1
cand(k)%snr=snr1
cand(k)%f=f0
cand(k)%xdt=sync(n)%xdt
cand(k)%ipol=sync(n)%ipol
cand(k)%iflip=nint(flip)
if(k.ge.MAX_CANDIDATES) exit
enddo
ncand=k
return
end subroutine get_candidates
subroutine wb2_sync(ss,savg,jz,nfa,nfb)
! Compute "orange sync curve" using the Q65 sync pattern
parameter (NFFT=32768)
parameter (LAGMAX=30)
real ss(4,322,NFFT)
real savg(4,NFFT)
real savg_med(4)
logical first
integer isync(22)
integer jsync0(63),jsync1(63)
! Q65 sync symbols
data isync/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/
data jsync0/ &
1, 4, 5, 9, 10, 11, 12, 13, 14, 16, 18, 22, 24, 25, 28, 32, &
33, 34, 37, 38, 39, 40, 42, 43, 45, 46, 47, 48, 52, 53, 55, 57, &
59, 60, 63, 64, 66, 68, 70, 73, 80, 81, 89, 90, 92, 95, 97, 98, &
100,102,104,107,108,111,114,119,120,121,122,123,124,125,126/
data jsync1/ &
2, 3, 6, 7, 8, 15, 17, 19, 20, 21, 23, 26, 27, 29, 30, 31, &
35, 36, 41, 44, 49, 50, 51, 54, 56, 58, 61, 62, 65, 67, 69, 71, &
72, 74, 75, 76, 77, 78, 79, 82, 83, 84, 85, 86, 87, 88, 91, 93, &
94, 96, 99,101,103,105,106,109,110,112,113,115,116,117,118/
data first/.true./
save first,isync,jsync0,jsync1
tstep=2048.0/11025.0 !0.185760 s: 0.5*tsym_jt65, 0.3096*tsym_q65
if(first) then
fac=0.6/tstep
do i=1,22 !Expand the Q65 sync stride
isync(i)=nint((isync(i)-1)*fac) + 1
enddo
do i=1,63
jsync0(i)=2*(jsync0(i)-1) + 1
jsync1(i)=2*(jsync1(i)-1) + 1
enddo
first=.false.
endif
df3=96000.0/NFFT
ia=nint(1000*nfa/df3) + 1 !Flat frequency range for WSE converters
ib=nint(1000*nfb/df3) + 1
do i=1,4
call pctile(savg(i,ia:ib),ib-ia+1,50,savg_med(i))
enddo
! do i=ia,ib
! write(14,3014) 0.001*(i-1)*df3,savg(1:4,i)
!3014 format(5f10.3)
! enddo
lagbest=0
ipolbest=1
flip=0.
do i=ia,ib
ccfmax=0.
do ipol=1,4
do lag=0,LAGMAX
ccf=0.
do j=1,22
k=isync(j) + lag
ccf=ccf + ss(ipol,k,i+1) + ss(ipol,k+1,i+1) + ss(ipol,k+2,i+1)
enddo
ccf=ccf - savg(ipol,i+1)*3*22/float(jz)
if(ccf.gt.ccfmax) then
ipolbest=ipol
lagbest=lag
ccfmax=ccf
flip=0.
endif
ccf=0.
do j=1,63
k=jsync0(j) + lag
ccf=ccf + ss(ipol,k,i+1) + ss(ipol,k+1,i+1)
enddo
ccf=ccf - savg(ipol,i+1)*2*63/float(jz)
if(ccf.gt.ccfmax) then
ipolbest=ipol
lagbest=lag
ccfmax=ccf
flip=1.0
endif
ccf=0.
do j=1,63
k=jsync1(j) + lag
ccf=ccf + ss(ipol,k,i+1) + ss(ipol,k+1,i+1)
enddo
ccf=ccf - savg(ipol,i+1)*2*63/float(jz)
if(ccf.gt.ccfmax) then
ipolbest=ipol
lagbest=lag
ccfmax=ccf
flip=-1.0
endif
enddo ! lag
enddo !ipol
sync(i)%ccfmax=ccfmax
sync(i)%xdt=lagbest*tstep-1.0
sync(i)%ipol=ipolbest
sync(i)%iflip=flip
sync(i)%birdie=.false.
if(ccfmax/(savg(ipolbest,i)/savg_med(ipolbest)).lt.3.0) sync(i)%birdie=.true.
enddo ! i (frequency bin)
! do i=ia,ib
! write(15,3015) 0.001*(i-1)*df3,sync(i)%ccfmax,sync(i)%xdt,sync(i)%ipol, &
! sync(i)%iflip,sync(i)%birdie
!3015 format(3f10.3,2i6,L5)
! enddo
call pctile(sync(ia:ib)%ccfmax,ib-ia+1,50,base)
sync(ia:ib)%ccfmax=sync(ia:ib)%ccfmax/base
! print*,base
return
end subroutine wb2_sync
end module wideband2_sync

View File

@ -1,96 +1,229 @@
module wideband_sync module wideband_sync
type candidate
real :: snr !Relative S/N of sync detection
real :: f !Freq of sync tone, 0 to 96000 Hz
real :: xdt !DT of matching sync pattern, -1.0 to +4.0 s
integer :: ipol !Polarization angle, 1 to 4 ==> 0, 45, 90, 135 deg
integer :: iflip !Sync type: JT65 = +/- 1, Q65 = 0
end type candidate
type sync_dat
real :: ccfmax
real :: xdt
integer :: ipol
integer :: iflip
logical :: birdie
end type sync_dat
parameter (NFFT=32768) parameter (NFFT=32768)
integer isync(22) parameter (MAX_CANDIDATES=20)
type(sync_dat) :: sync(NFFT)
integer nkhz_center integer nkhz_center
real sync_dat(NFFT,4) !fkhz, ccfmax, xdt, ipol
contains contains
subroutine get_candidates(ss,savg,nfa,nfb,nts_jt65,nts_q65,cand,ncand)
! Search symbol spectra ss() over frequency range nfa to nfb (in kHz) for
! JT65 and Q65 sync patterns. The nts_* variables are the submode tone
! spacings: 1 2 4 8 16 for A B C D E. Birdies are detected and
! excised. Candidates are returned in the structure array cand().
parameter (MAX_PEAKS=300)
real ss(4,322,NFFT),savg(4,NFFT)
real pavg(-20:20)
integer indx(NFFT)
logical skip
type(candidate) :: cand(MAX_CANDIDATES)
do j=322,1,-1 !Find end of data in ss()
if(sum(ss(1,j,1:NFFT)).gt.0.0) exit
enddo
jz=j
subroutine wb_sync(ss,savg,ntone_spacing) call wb_sync(ss,savg,jz,nfa,nfb)
tstep=2048.0/11025.0 !0.185760 s: 0.5*tsym_jt65, 0.3096*tsym_q65
df3=96000.0/NFFT
ia=nint(1000*nfa/df3) + 1
ib=nint(1000*nfb/df3) + 1
iz=ib-ia+1
call indexx(sync(ia:ib)%ccfmax,iz,indx) !Sort by relative snr
k=0
do i=1,MAX_PEAKS
n=indx(iz+1-i) + ia - 1
f0=0.001*(n-1)*df3
snr1=sync(n)%ccfmax
! print*,'=',f0,snr1
if(snr1.lt.4.5) exit
flip=sync(n)%iflip
if(flip.ne.0.0 .and. nts_jt65.eq.0) cycle
if(flip.eq.0.0 .and. nts_q65.eq.0) cycle
if(sync(n)%birdie) cycle
! Test for signal outside of TxT range and set bw for this signal type
j1=(sync(n)%xdt + 1.0)/tstep - 1.0
j2=(sync(n)%xdt + 52.0)/tstep + 1.0
if(flip.ne.0) j2=(sync(n)%xdt + 47.811)/tstep + 1.0
ipol=sync(n)%ipol
pavg=0.
do j=1,j1
pavg=pavg + ss(ipol,j,n-20:n+20)
enddo
do j=j2,jz
pavg=pavg + ss(ipol,j,n-20:n+20)
enddo
jsum=j1 + (jz-j2+1)
pmax=maxval(pavg(-2:2)) !### Why not just pavg(0) ?
base=(sum(pavg)-pmax)/jsum
pmax=pmax/base
if(pmax.gt.5.0) cycle
skip=.false.
do m=1,k !Skip false syncs within signal bw
diffhz=1000.0*(f0-cand(m)%f)
bw=nts_q65*108.0
if(cand(m)%iflip.ne.0) bw=nts_jt65*178.0
if(diffhz.gt.-20.0 .and. diffhz.lt.bw) skip=.true.
! write(*,3301) i,k,m,f0,cand(m)%f,diffhz,snr1,skip
!3301 format('=',3i5,f10.1,3f10.3,L3)
enddo
if(skip) cycle
k=k+1
cand(k)%snr=snr1
cand(k)%f=f0
cand(k)%xdt=sync(n)%xdt
cand(k)%ipol=sync(n)%ipol
cand(k)%iflip=nint(flip)
if(k.ge.MAX_CANDIDATES) exit
enddo
ncand=k
return
end subroutine get_candidates
subroutine wb_sync(ss,savg,jz,nfa,nfb)
! Compute "orange sync curve" using the Q65 sync pattern ! Compute "orange sync curve" using the Q65 sync pattern
parameter (NFFT=32768)
parameter (LAGMAX=30) parameter (LAGMAX=30)
real ss(4,322,NFFT) real ss(4,322,NFFT)
real savg(4,NFFT) real savg(4,NFFT)
real savg_med(4)
logical first logical first
character*1 c1 integer isync(22)
! integer hist(0:20) integer jsync0(63),jsync1(63)
integer isync0(22)
! Q65 sync symbols
data isync0/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/
data first/.true./
save first
tstep=2048.0/11025.0 ! Q65 sync symbols
data isync/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/
data jsync0/ &
1, 4, 5, 9, 10, 11, 12, 13, 14, 16, 18, 22, 24, 25, 28, 32, &
33, 34, 37, 38, 39, 40, 42, 43, 45, 46, 47, 48, 52, 53, 55, 57, &
59, 60, 63, 64, 66, 68, 70, 73, 80, 81, 89, 90, 92, 95, 97, 98, &
100,102,104,107,108,111,114,119,120,121,122,123,124,125,126/
data jsync1/ &
2, 3, 6, 7, 8, 15, 17, 19, 20, 21, 23, 26, 27, 29, 30, 31, &
35, 36, 41, 44, 49, 50, 51, 54, 56, 58, 61, 62, 65, 67, 69, 71, &
72, 74, 75, 76, 77, 78, 79, 82, 83, 84, 85, 86, 87, 88, 91, 93, &
94, 96, 99,101,103,105,106,109,110,112,113,115,116,117,118/
data first/.true./
save first,isync,jsync0,jsync1
tstep=2048.0/11025.0 !0.185760 s: 0.5*tsym_jt65, 0.3096*tsym_q65
if(first) then if(first) then
fac=0.6/tstep fac=0.6/tstep
do i=1,22 !Expand the sync stride do i=1,22 !Expand the Q65 sync stride
isync(i)=nint((isync0(i)-1)*fac) + 1 isync(i)=nint((isync(i)-1)*fac) + 1
enddo
do i=1,63
jsync0(i)=2*(jsync0(i)-1) + 1
jsync1(i)=2*(jsync1(i)-1) + 1
enddo enddo
first=.false. first=.false.
endif endif
df=96000.0/NFFT df3=96000.0/NFFT
ia=nint(7000.0/df) !Flat frequency range for WSE converters ia=nint(1000*nfa/df3) + 1 !Flat frequency range for WSE converters
ib=nint(89000.0/df) ib=nint(1000*nfb/df3) + 1
lagbest=-1
ipolbest=-1 do i=1,4
call pctile(savg(i,ia:ib),ib-ia+1,50,savg_med(i))
enddo
! do i=ia,ib
! write(14,3014) 0.001*(i-1)*df3,savg(1:4,i)
!3014 format(5f10.3)
! enddo
lagbest=0
ipolbest=1
flip=0.
do i=ia,ib do i=ia,ib
ccfmax=0. ccfmax=0.
do ipol=1,4 do ipol=1,4
do lag=0,LAGMAX do lag=0,LAGMAX
ccf=0. ccf=0.
do j=1,22 do j=1,22
k=isync(j) + lag k=isync(j) + lag
ccf=ccf + ss(ipol,k,i+1) ccf=ccf + ss(ipol,k,i+1) + ss(ipol,k+1,i+1) + ss(ipol,k+2,i+1)
enddo enddo
ccf=ccf - savg(ipol,i+1)*22.0/322.0 ccf=ccf - savg(ipol,i+1)*3*22/float(jz)
if(ccf.gt.ccfmax) then if(ccf.gt.ccfmax) then
ipolbest=ipol ipolbest=ipol
lagbest=lag lagbest=lag
ccfmax=ccf ccfmax=ccf
flip=0.
endif endif
ccf=0.
do j=1,63
k=jsync0(j) + lag
ccf=ccf + ss(ipol,k,i+1) + ss(ipol,k+1,i+1)
enddo
ccf=ccf - savg(ipol,i+1)*2*63/float(jz)
if(ccf.gt.ccfmax) then
ipolbest=ipol
lagbest=lag
ccfmax=ccf
flip=1.0
endif
ccf=0.
do j=1,63
k=jsync1(j) + lag
ccf=ccf + ss(ipol,k,i+1) + ss(ipol,k+1,i+1)
enddo
ccf=ccf - savg(ipol,i+1)*2*63/float(jz)
if(ccf.gt.ccfmax) then
ipolbest=ipol
lagbest=lag
ccfmax=ccf
flip=-1.0
endif
enddo ! lag enddo ! lag
enddo !ipol enddo !ipol
fkhz=0.001*i*df + nkhz_center - 48.0 sync(i)%ccfmax=ccfmax
xdt=lagbest*tstep-1.0 sync(i)%xdt=lagbest*tstep-1.0
sync_dat(i,1)=fkhz sync(i)%ipol=ipolbest
sync_dat(i,2)=ccfmax sync(i)%iflip=flip
sync_dat(i,3)=xdt sync(i)%birdie=.false.
sync_dat(i,4)=ipolbest if(ccfmax/(savg(ipolbest,i)/savg_med(ipolbest)).lt.3.0) sync(i)%birdie=.true.
enddo enddo ! i (frequency bin)
call pctile(sync_dat(ia:ib,2),ib-ia+1,50,base)
sync_dat(ia:ib,2)=sync_dat(ia:ib,2)/base
! hist=0
! s2_avg=63.5*ntone_spacing
! do i=ia,ib ! do i=ia,ib
! f0=0.001*i*df ! write(15,3015) 0.001*(i-1)*df3,sync(i)%ccfmax,sync(i)%xdt,sync(i)%ipol, &
! write(70,3010) f0,sync_dat(i,2:3),nint(sync_dat(i,4)), & ! sync(i)%iflip,sync(i)%birdie
! 0.001*i*df,nkhz_center !3015 format(3f10.3,2i6,L5)
!3010 format(3f10.3,i5,f10.3,i5)
! x=min(sync_dat(i,2),20.0)
! nx=x
! hist(nx)=hist(nx)+1
! if(x.gt.2.5) then
! c1=' '
! s0=sync_dat(i,2) - 1.0
! s1=(sync_dat(i-1,2) + sync_dat(i+1,2) - 2.0)/s0
! s2=(sum(sync_dat(i+ntone_spacing/2+1:i+64*ntone_spacing,2)) - s2_avg)/s0
! if(s2.ge.0.5) c1='*'
! write(72,3072) f0,s0,s1,s2,c1
!3072 format(f12.6,3f10.3,2x,a1)
! endif
! enddo
! do i=0,20
! write(71,3071) i,hist(i)
!3071 format(i2,i8)
! enddo ! enddo
call pctile(sync(ia:ib)%ccfmax,ib-ia+1,50,base)
sync(ia:ib)%ccfmax=sync(ia:ib)%ccfmax/base
! print*,base
return return
end subroutine wb_sync end subroutine wb_sync