w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-24 14:15:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Q65: Supppress birdies and don't display decode lines with blank message.

Browse Source
This commit is contained in:
Joe Taylor 2021-02-11 11:30:35 -05:00
parent 3962a1eeba
commit 1aad2fdbda
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/q65_decode.f90
View File

@ -249,13 +249,13 @@ contains
c6,c4,trim(decoded) c6,c4,trim(decoded)
close(22) close(22)
endif endif
else ! else
! Report snr1, even if no decode. ! Report snr1, even if no decode.
nsnr=db(snr1) - 35.0 ! nsnr=db(snr1) - 35.0
if(nsnr.lt.-35) nsnr=-35 ! if(nsnr.lt.-35) nsnr=-35
idec=-1 ! idec=-1
call this%callback(nutc,snr1,nsnr,xdt,f0,decoded, & ! call this%callback(nutc,snr1,nsnr,xdt,f0,decoded, &
idec,0,ntrperiod) ! idec,0,ntrperiod)
endif endif
navg0=1000*navg(0) + navg(1) navg0=1000*navg(0) + navg(1)
if(single_decode .or. lagain) go to 900 if(single_decode .or. lagain) go to 900

17
lib/qra/q65/q65.f90
View File

@ -58,8 +58,10 @@ subroutine q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, &
parameter (LN=2176*63) !LN=LL*NN; LL=64*(mode_q65+2), NN=63 parameter (LN=2176*63) !LN=LL*NN; LL=64*(mode_q65+2), NN=63
integer*2 iwave(0:12000*ntrperiod-1) !Raw data integer*2 iwave(0:12000*ntrperiod-1) !Raw data
integer dat4(13) integer dat4(13)
integer ipk1(1)
character*37 decoded character*37 decoded
logical first,lclearave logical first,lclearave
integer, allocatable :: hist(:)
real, allocatable :: s1(:,:) !Symbol spectra, 1/8-symbol steps real, allocatable :: s1(:,:) !Symbol spectra, 1/8-symbol steps
real, allocatable :: s3(:,:) !Data-symbol energies s3(LL,63) real, allocatable :: s3(:,:) !Data-symbol energies s3(LL,63)
real, allocatable :: ccf1(:) !CCF(freq) at fixed lag (red) real, allocatable :: ccf1(:) !CCF(freq) at fixed lag (red)
@ -99,6 +101,7 @@ subroutine q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, &
allocate(s3(-64:LL-65,63)) allocate(s3(-64:LL-65,63))
allocate(ccf1(-ia2:ia2)) allocate(ccf1(-ia2:ia2))
allocate(ccf2(iz)) allocate(ccf2(iz))
allocate(hist(LL))
if(LL.ne.LL0 .or. iz.ne.iz0 .or. jz.ne.jz0 .or. lclearave) then if(LL.ne.LL0 .or. iz.ne.iz0 .or. jz.ne.jz0 .or. lclearave) then
if(allocated(s1a)) deallocate(s1a) if(allocated(s1a)) deallocate(s1a)
allocate(s1a(iz,jz,0:1)) allocate(s1a(iz,jz,0:1))
@ -128,9 +131,21 @@ subroutine q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, &
i0=nint(nfqso/df) !Target QSO frequency i0=nint(nfqso/df) !Target QSO frequency
if(i0-64.lt.1 .or. i0-65+LL.gt.iz) go to 900 !Frequency out of range if(i0-64.lt.1 .or. i0-65+LL.gt.iz) go to 900 !Frequency out of range
call pctile(s1(i0-64:i0-65+LL,1:jz),LL*jz,40,base) call pctile(s1(i0-64:i0-65+LL,1:jz),LL*jz,45,base)
s1=s1/base s1=s1/base
! Detect and remove strong non-drifting birdies
hist=0
do j=1,jz
ipk1=maxloc(s1(i0-64:i0+LL-65,j))
i=ipk1(1)
hist(i)=hist(i)+1
enddo
nbirdie=80
do i=1,LL
if(hist(i).gt.nbirdie) s1(i0-65+i,1:jz)=1.0
enddo
! Apply fast AGC to the symbol spectra ! Apply fast AGC to the symbol spectra
s1max=20.0 !Empirical choice s1max=20.0 !Empirical choice
do j=1,jz !### Maybe wrong way? ### do j=1,jz !### Maybe wrong way? ###