mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-10-31 15:47:10 -04:00
More WIP on wideband Q65 decoding.
This commit is contained in:
parent
af6d406aeb
commit
37b6b4b22c
@ -37,17 +37,20 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
|
||||
save
|
||||
|
||||
nkhz_center=nint(1000.0*(fcenter-int(fcenter)))
|
||||
ntone_spacing=2**(nmode/10)
|
||||
call timer('wb_sync ',0)
|
||||
! call wb_sync(ss,savg,ntone_spacing)
|
||||
call timer('wb_sync ',1)
|
||||
|
||||
!###
|
||||
mfa=nfa-nkhz_center+48
|
||||
mfb=nfb-nkhz_center+48
|
||||
nts_jt65=2
|
||||
nts_q65=1
|
||||
call timer('get_cand',0)
|
||||
call get_candidates(ss,savg,mfa,mfb,nts_jt65,nts_q65,cand,ncand)
|
||||
call timer('get_cand',1)
|
||||
!###
|
||||
! do k=1,ncand
|
||||
! write(*,3010) k,cand(k)%snr,cand(k)%f,cand(k)%f+77,cand(k)%xdt, &
|
||||
! cand(k)%ipol,cand(k)%iflip
|
||||
!3010 format(i3,4f10.3,2i3)
|
||||
! enddo
|
||||
|
||||
! print*,'AAA',nfa,nfb,ncand
|
||||
!###
|
||||
|
||||
|
@ -65,11 +65,7 @@ call wb2_sync(ss,savg,jz,nfa,nfb)
|
||||
! 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
|
||||
bw=nts_q65*108.0
|
||||
if(flip.ne.0) then
|
||||
bw=nts_jt65*177.0
|
||||
j2=(sync(n)%xdt + 47.811)/tstep + 1.0
|
||||
endif
|
||||
if(flip.ne.0) j2=(sync(n)%xdt + 47.811)/tstep + 1.0
|
||||
ipol=sync(n)%ipol
|
||||
pavg=0.
|
||||
do j=1,j1
|
||||
@ -83,14 +79,14 @@ call wb2_sync(ss,savg,jz,nfa,nfb)
|
||||
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*177.0
|
||||
if(diffhz.gt.-10.0 .and. diffhz.lt.bw) skip=.true.
|
||||
enddo
|
||||
if(skip) cycle
|
||||
|
||||
k=k+1
|
||||
cand(k)%snr=snr1
|
||||
cand(k)%f=f0
|
||||
|
Loading…
Reference in New Issue
Block a user