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

Suppress duplicate decodes.

Browse Source
This commit is contained in:
Joe Taylor 2021-07-07 10:12:36 -04:00
parent bada2dd822
commit 3307cb2f9e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
map65/libm65/map65a.f90
View File

@ -47,7 +47,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
xpol=(nxpol.ne.0) xpol=(nxpol.ne.0)
nts_jt65=2**(mode65-1) !JT65 tone separation factor nts_jt65=2**(mode65-1) !JT65 tone separation factor
nts_q65=2**(mode_q65) !Q65 tone separation factor nts_q65=2**(mode_q65-1) !Q65 tone separation factor
if(nagain.eq.0) then if(nagain.eq.0) then
call timer('get_cand',0) call timer('get_cand',0)
call get_candidates(ss,savg,xpol,mfa,mfb,nts_jt65,nts_q65,cand,ncand) call get_candidates(ss,savg,xpol,mfa,mfb,nts_jt65,nts_q65,cand,ncand)
@ -57,9 +57,9 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
!### !###
! do k=1,ncand ! do k=1,ncand
! freq=cand(k)%f+nkhz_center-48.0-1.27046 ! freq=cand(k)%f+nkhz_center-48.0-1.27046
! write(70,3010) nutc,k,cand(k)%snr,cand(k)%f,freq,cand(k)%xdt, & ! write(*,3010) nutc,k,db(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('=a',i5.4,i5,f8.2,3f10.3,2i3)
! enddo ! enddo
!### !###

8
map65/libm65/wideband_sync.f90
View File

@ -32,7 +32,7 @@ subroutine get_candidates(ss,savg,xpol,nfa,nfb,nts_jt65,nts_q65,cand,ncand)
! spacings: 1 2 4 8 16 for A B C D E. Birdies are detected and ! 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(). ! excised. Candidates are returned in the structure array cand().
parameter (MAX_PEAKS=300) parameter (MAX_PEAKS=100)
real ss(4,322,NFFT),savg(4,NFFT) real ss(4,322,NFFT),savg(4,NFFT)
real pavg(-20:20) real pavg(-20:20)
integer indx(NFFT) integer indx(NFFT)
@ -87,11 +87,11 @@ subroutine get_candidates(ss,savg,xpol,nfa,nfb,nts_jt65,nts_q65,cand,ncand)
diffhz=1000.0*(f0-cand(m)%f) diffhz=1000.0*(f0-cand(m)%f)
bw=nts_q65*110.0 bw=nts_q65*110.0
if(cand(m)%iflip.ne.0) bw=nts_jt65*178.0 if(cand(m)%iflip.ne.0) bw=nts_jt65*178.0
if(diffhz.gt.-20.0 .and. diffhz.lt.bw+20.0) skip=.true. if(diffhz.gt.-0.03*bw .and. diffhz.lt.1.03*bw) skip=.true.
! write(*,3301) i,k,m,f0,cand(m)%f,diffhz,snr1,skip
!3301 format('=',3i5,f10.1,3f10.3,L3)
enddo enddo
if(skip) cycle if(skip) cycle
! write(*,3301) i,k,m,f0,diffhz,bw,db(snr1)
!3301 format('=A',3i5,f8.3,2f8.0,f8.2)
k=k+1 k=k+1
cand(k)%snr=snr1 cand(k)%snr=snr1
cand(k)%f=f0 cand(k)%f=f0