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

Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0

Browse Source
This commit is contained in:
Bill Somerville 2019-06-16 22:46:02 +01:00
commit 6a3ad76abb
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
4 changed files with 219 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ft4/getcandidates4.f90
View File

@ -8,7 +8,7 @@ subroutine getcandidates4(dd,fa,fb,syncmin,nfqso,maxcand,savg,candidate, &
real x(NFFT1) real x(NFFT1)
real window(NFFT1) real window(NFFT1)
complex cx(0:NH1) complex cx(0:NH1)
real candidate(3,maxcand) real candidate(2,maxcand)
real dd(NMAX) real dd(NMAX)
integer ipk(1) integer ipk(1)
equivalence (x,cx) equivalence (x,cx)
@ -64,8 +64,7 @@ subroutine getcandidates4(dd,fa,fb,syncmin,nfqso,maxcand,savg,candidate, &
speak=savsm(i) - 0.25*(savsm(i-1)-savsm(i+1))*del speak=savsm(i) - 0.25*(savsm(i-1)-savsm(i+1))*del
ncand=ncand+1 ncand=ncand+1
candidate(1,ncand)=fpeak candidate(1,ncand)=fpeak
candidate(2,ncand)=-99.99 candidate(2,ncand)=speak
candidate(3,ncand)=speak
if(ncand.eq.maxcand) exit if(ncand.eq.maxcand) exit
endif endif
enddo enddo

10
lib/ft4/sync4d.f90
View File

@ -9,7 +9,6 @@ subroutine sync4d(cd0,i0,ctwk,itwk,sync)
complex csync2(2*NSS) complex csync2(2*NSS)
complex ctwk(2*NSS) complex ctwk(2*NSS)
complex z1,z2,z3,z4 complex z1,z2,z3,z4
complex zz1,zz2,zz3,zz4
logical first logical first
integer icos4a(0:3),icos4b(0:3),icos4c(0:3),icos4d(0:3) integer icos4a(0:3),icos4b(0:3),icos4c(0:3),icos4d(0:3)
data icos4a/0,1,3,2/ data icos4a/0,1,3,2/
@ -19,7 +18,7 @@ subroutine sync4d(cd0,i0,ctwk,itwk,sync)
data first/.true./ data first/.true./
save first,twopi,csynca,csyncb,csyncc,csyncd,fac save first,twopi,csynca,csyncb,csyncc,csyncd,fac
p(z1)=real(z1*fac)**2 + aimag(z1*fac)**2 !Statement function for power p(z1)=(real(z1*fac)**2 + aimag(z1*fac)**2)**0.5 !Statement function for power
if( first ) then if( first ) then
twopi=8.0*atan(1.0) twopi=8.0*atan(1.0)
@ -60,11 +59,12 @@ subroutine sync4d(cd0,i0,ctwk,itwk,sync)
z4=0. z4=0.
if(itwk.eq.1) csync2=ctwk*csynca !Tweak the frequency if(itwk.eq.1) csync2=ctwk*csynca !Tweak the frequency
z1=0.
if(i1.ge.0 .and. i1+4*NSS-1.le.NP-1) then if(i1.ge.0 .and. i1+4*NSS-1.le.NP-1) then
z1=sum(cd0(i1:i1+4*NSS-1:2)*conjg(csync2)) z1=sum(cd0(i1:i1+4*NSS-1:2)*conjg(csync2))
elseif( i1.lt.0 ) then elseif( i1.lt.0 ) then
npts=(i1+4*NSS-1)/2 npts=(i1+4*NSS-1)/2
if(npts.le.8) then if(npts.le.16) then
z1=0. z1=0.
else else
z1=sum(cd0(0:i1+4*NSS-1:2)*conjg(csync2(2*NSS-npts:))) z1=sum(cd0(0:i1+4*NSS-1:2)*conjg(csync2(2*NSS-npts:)))
@ -78,16 +78,18 @@ subroutine sync4d(cd0,i0,ctwk,itwk,sync)
if(i3.ge.0 .and. i3+4*NSS-1.le.NP-1) z3=sum(cd0(i3:i3+4*NSS-1:2)*conjg(csync2)) if(i3.ge.0 .and. i3+4*NSS-1.le.NP-1) z3=sum(cd0(i3:i3+4*NSS-1:2)*conjg(csync2))
if(itwk.eq.1) csync2=ctwk*csyncd !Tweak the frequency if(itwk.eq.1) csync2=ctwk*csyncd !Tweak the frequency
z4=0.
if(i4.ge.0 .and. i4+4*NSS-1.le.NP-1) then if(i4.ge.0 .and. i4+4*NSS-1.le.NP-1) then
z4=sum(cd0(i4:i4+4*NSS-1:2)*conjg(csync2)) z4=sum(cd0(i4:i4+4*NSS-1:2)*conjg(csync2))
elseif( i4+4*NSS-1.gt.NP-1 ) then elseif( i4+4*NSS-1.gt.NP-1 ) then
npts=(NP-1-i4+1)/2 npts=(NP-1-i4+1)/2
if(npts.le.8) then if(npts.le.16) then
z4=0. z4=0.
else else
z4=sum(cd0(i4:i4+2*npts-1:2)*conjg(csync2(1:npts))) z4=sum(cd0(i4:i4+2*npts-1:2)*conjg(csync2(1:npts)))
endif endif
endif endif
sync = p(z1) + p(z2) + p(z3) + p(z4) sync = p(z1) + p(z2) + p(z3) + p(z4)
return return

407
lib/ft4_decode.f90
View File

@ -50,7 +50,7 @@ contains
real bitmetrics(2*NN,3) real bitmetrics(2*NN,3)
real dd(NMAX) real dd(NMAX)
real llr(2*ND),llra(2*ND),llrb(2*ND),llrc(2*ND),llrd(2*ND) real llr(2*ND),llra(2*ND),llrb(2*ND),llrc(2*ND),llrd(2*ND)
real candidate(3,100) real candidate(2,100)
real savg(NH1),sbase(NH1) real savg(NH1),sbase(NH1)
integer apbits(2*ND) integer apbits(2*ND)
@ -194,7 +194,7 @@ contains
dd=iwave dd=iwave
! ndepth=3: 3 passes, bp+osd ! ndepth=3: 3 passes, bp+osd
! ndepth=2: 3 passes, bp only ! ndepth=2: 3 passes, bp only
! ndepth=1: 1 pass, no subtraction ! ndepth=1: 1 pass, no subtraction
max_iterations=40 max_iterations=40
@ -203,23 +203,23 @@ contains
doosd=.true. doosd=.true.
nsp=3 nsp=3
if(ndepth.eq.2) then if(ndepth.eq.2) then
doosd=.false. doosd=.false.
endif endif
if(ndepth.eq.1) then if(ndepth.eq.1) then
nsp=1 nsp=1
dosubtract=.false. dosubtract=.false.
doosd=.false. doosd=.false.
endif endif
do isp = 1,nsp do isp = 1,nsp
if(isp.eq.2) then if(isp.eq.2) then
if(ndecodes.eq.0) exit if(ndecodes.eq.0) exit
nd1=ndecodes nd1=ndecodes
elseif(isp.eq.3) then elseif(isp.eq.3) then
nd2=ndecodes-nd1 nd2=ndecodes-nd1
if(nd2.eq.0) exit if(nd2.eq.0) exit
endif endif
candidate=0.0 candidate=0.0
ncand=0 ncand=0
call timer('getcand4',0) call timer('getcand4',0)
@ -229,7 +229,7 @@ contains
dobigfft=.true. dobigfft=.true.
do icand=1,ncand do icand=1,ncand
f0=candidate(1,icand) f0=candidate(1,icand)
snr=candidate(3,icand)-1.0 snr=candidate(2,icand)-1.0
call timer('ft4_down',0) call timer('ft4_down',0)
call ft4_downsample(dd,dobigfft,f0,cd2) !Downsample to 32 Sam/Sym call ft4_downsample(dd,dobigfft,f0,cd2) !Downsample to 32 Sam/Sym
call timer('ft4_down',1) call timer('ft4_down',1)
@ -237,101 +237,113 @@ contains
sum2=sum(cd2*conjg(cd2))/(real(NMAX)/real(NDOWN)) sum2=sum(cd2*conjg(cd2))/(real(NMAX)/real(NDOWN))
if(sum2.gt.0.0) cd2=cd2/sqrt(sum2) if(sum2.gt.0.0) cd2=cd2/sqrt(sum2)
! Sample rate is now 12000/18 = 666.67 samples/second ! Sample rate is now 12000/18 = 666.67 samples/second
do isync=1,2 do iseg=1,3 ! DT search is done over 3 segments
if(isync.eq.1) then do isync=1,2
idfmin=-12 if(isync.eq.1) then
idfmax=12 idfmin=-12
idfstp=3 idfmax=12
ibmin=-344 idfstp=3
ibmax=1012 ibmin=-344
ibstp=4 ibmax=1012
else if(iseg.eq.1) then
idfmin=idfbest-4 ibmin=108
idfmax=idfbest+4 ibmax=560
idfstp=1 elseif(iseg.eq.2) then
ibmin=ibest-5 smax1=smax
ibmax=ibest+5 ibmin=560
ibstp=1 ibmax=1012
endif elseif(iseg.eq.3) then
ibest=-1 ibmin=-344
smax=-99. ibmax=108
idfbest=0
call timer('sync4d ',0)
do idf=idfmin,idfmax,idfstp
do istart=ibmin,ibmax,ibstp
call sync4d(cd2,istart,ctwk2(:,idf),1,sync) !Find sync power
if(sync.gt.smax) then
smax=sync
ibest=istart
idfbest=idf
endif endif
ibstp=4
else
idfmin=idfbest-4
idfmax=idfbest+4
idfstp=1
ibmin=ibest-5
ibmax=ibest+5
ibstp=1
endif
ibest=-1
idfbest=0
smax=-99.
call timer('sync4d ',0)
do idf=idfmin,idfmax,idfstp
do istart=ibmin,ibmax,ibstp
call sync4d(cd2,istart,ctwk2(:,idf),1,sync) !Find sync power
if(sync.gt.smax) then
smax=sync
ibest=istart
idfbest=idf
endif
enddo
enddo enddo
call timer('sync4d ',1)
enddo enddo
call timer('sync4d ',1) if(iseg.eq.1) smax1=smax
enddo if(smax.lt.0.7) cycle
if(smax.lt.0.7) cycle if(iseg.gt.1 .and. smax.lt.smax1) cycle
f0=f0+real(idfbest) f1=f0+real(idfbest)
if( f0.le.10.0 .or. f0.ge.4990.0 ) cycle if( f1.le.10.0 .or. f1.ge.4990.0 ) cycle
call timer('ft4down ',0) call timer('ft4down ',0)
call ft4_downsample(dd,dobigfft,f0,cb) !Final downsample, corrected f0 call ft4_downsample(dd,dobigfft,f1,cb) !Final downsample, corrected f0
call timer('ft4down ',1) call timer('ft4down ',1)
sum2=sum(abs(cb)**2)/(real(NSS)*NN) sum2=sum(abs(cb)**2)/(real(NSS)*NN)
if(sum2.gt.0.0) cb=cb/sqrt(sum2) if(sum2.gt.0.0) cb=cb/sqrt(sum2)
cd=0. cd=0.
if(ibest.ge.0) then if(ibest.ge.0) then
it=min(NDMAX-1,ibest+NN*NSS-1) it=min(NDMAX-1,ibest+NN*NSS-1)
np=it-ibest+1 np=it-ibest+1
cd(0:np-1)=cb(ibest:it) cd(0:np-1)=cb(ibest:it)
else else
cd(-ibest:ibest+NN*NSS-1)=cb(0:NN*NSS+2*ibest-1) cd(-ibest:ibest+NN*NSS-1)=cb(0:NN*NSS+2*ibest-1)
endif
call timer('bitmet ',0)
call get_ft4_bitmetrics(cd,bitmetrics,badsync)
call timer('bitmet ',1)
if(badsync) cycle
hbits=0
where(bitmetrics(:,1).ge.0) hbits=1
ns1=count(hbits( 1: 8).eq.(/0,0,0,1,1,0,1,1/))
ns2=count(hbits( 67: 74).eq.(/0,1,0,0,1,1,1,0/))
ns3=count(hbits(133:140).eq.(/1,1,1,0,0,1,0,0/))
ns4=count(hbits(199:206).eq.(/1,0,1,1,0,0,0,1/))
nsync_qual=ns1+ns2+ns3+ns4
if(nsync_qual.lt. 20) cycle
scalefac=2.83
llra( 1: 58)=bitmetrics( 9: 66, 1)
llra( 59:116)=bitmetrics( 75:132, 1)
llra(117:174)=bitmetrics(141:198, 1)
llra=scalefac*llra
llrb( 1: 58)=bitmetrics( 9: 66, 2)
llrb( 59:116)=bitmetrics( 75:132, 2)
llrb(117:174)=bitmetrics(141:198, 2)
llrb=scalefac*llrb
llrc( 1: 58)=bitmetrics( 9: 66, 3)
llrc( 59:116)=bitmetrics( 75:132, 3)
llrc(117:174)=bitmetrics(141:198, 3)
llrc=scalefac*llrc
apmag=maxval(abs(llra))*1.1
npasses=3+nappasses(nQSOProgress)
if(lapcqonly) npasses=4
if(ndepth.eq.1) npasses=3
if(ncontest.ge.5) npasses=3 ! Don't support Fox and Hound
do ipass=1,npasses
if(ipass.eq.1) llr=llra
if(ipass.eq.2) llr=llrb
if(ipass.eq.3) llr=llrc
if(ipass.le.3) then
apmask=0
iaptype=0
endif endif
call timer('bitmet ',0)
call get_ft4_bitmetrics(cd,bitmetrics,badsync)
call timer('bitmet ',1)
if(badsync) cycle
hbits=0
where(bitmetrics(:,1).ge.0) hbits=1
ns1=count(hbits( 1: 8).eq.(/0,0,0,1,1,0,1,1/))
ns2=count(hbits( 67: 74).eq.(/0,1,0,0,1,1,1,0/))
ns3=count(hbits(133:140).eq.(/1,1,1,0,0,1,0,0/))
ns4=count(hbits(199:206).eq.(/1,0,1,1,0,0,0,1/))
nsync_qual=ns1+ns2+ns3+ns4
if(nsync_qual.lt. 20) cycle
if(ipass .gt. 3) then scalefac=2.83
llrd=llra llra( 1: 58)=bitmetrics( 9: 66, 1)
iaptype=naptypes(nQSOProgress,ipass-3) llra( 59:116)=bitmetrics( 75:132, 1)
if(lapcqonly) iaptype=1 llra(117:174)=bitmetrics(141:198, 1)
llra=scalefac*llra
llrb( 1: 58)=bitmetrics( 9: 66, 2)
llrb( 59:116)=bitmetrics( 75:132, 2)
llrb(117:174)=bitmetrics(141:198, 2)
llrb=scalefac*llrb
llrc( 1: 58)=bitmetrics( 9: 66, 3)
llrc( 59:116)=bitmetrics( 75:132, 3)
llrc(117:174)=bitmetrics(141:198, 3)
llrc=scalefac*llrc
apmag=maxval(abs(llra))*1.1
npasses=3+nappasses(nQSOProgress)
if(lapcqonly) npasses=4
if(ndepth.eq.1) npasses=3
if(ncontest.ge.5) npasses=3 ! Don't support Fox and Hound
do ipass=1,npasses
if(ipass.eq.1) llr=llra
if(ipass.eq.2) llr=llrb
if(ipass.eq.3) llr=llrc
if(ipass.le.3) then
apmask=0
iaptype=0
endif
if(ipass .gt. 3) then
llrd=llra
iaptype=naptypes(nQSOProgress,ipass-3)
if(lapcqonly) iaptype=1
! ncontest=0 : NONE ! ncontest=0 : NONE
! 1 : NA_VHF ! 1 : NA_VHF
@ -342,108 +354,111 @@ contains
! 6 : HOUND ! 6 : HOUND
! !
! Conditions that cause us to bail out of AP decoding ! Conditions that cause us to bail out of AP decoding
napwid=50 napwid=50
if(ncontest.le.4 .and. iaptype.ge.3 .and. (abs(f0-nfqso).gt.napwid) ) cycle if(ncontest.le.4 .and. iaptype.ge.3 .and. (abs(f1-nfqso).gt.napwid) ) cycle
if(iaptype.ge.2 .and. apbits(1).gt.1) cycle ! No, or nonstandard, mycall if(iaptype.ge.2 .and. apbits(1).gt.1) cycle ! No, or nonstandard, mycall
if(iaptype.ge.3 .and. apbits(30).gt.1) cycle ! No, or nonstandard, dxcall if(iaptype.ge.3 .and. apbits(30).gt.1) cycle ! No, or nonstandard, dxcall
if(iaptype.eq.1) then ! CQ or CQ TEST or CQ FD or CQ RU or CQ SCC if(iaptype.eq.1) then ! CQ or CQ TEST or CQ FD or CQ RU or CQ SCC
apmask=0 apmask=0
apmask(1:29)=1
llrd(1:29)=apmag*mcq(1:29)
endif
if(iaptype.eq.2) then ! MyCall,???,???
apmask=0
if(ncontest.eq.0.or.ncontest.eq.1) then
apmask(1:29)=1 apmask(1:29)=1
llrd(1:29)=apmag*apbits(1:29) llrd(1:29)=apmag*mcq(1:29)
else if(ncontest.eq.2) then
apmask(1:28)=1
llrd(1:28)=apmag*apbits(1:28)
else if(ncontest.eq.3) then
apmask(1:28)=1
llrd(1:28)=apmag*apbits(1:28)
else if(ncontest.eq.4) then
apmask(2:29)=1
llrd(2:29)=apmag*apmy_ru(1:28)
endif endif
endif
if(iaptype.eq.3) then ! MyCall,DxCall,??? if(iaptype.eq.2) then ! MyCall,???,???
apmask=0 apmask=0
if(ncontest.eq.0.or.ncontest.eq.1.or.ncontest.eq.2) then if(ncontest.eq.0.or.ncontest.eq.1) then
apmask(1:58)=1 apmask(1:29)=1
llrd(1:58)=apmag*apbits(1:58) llrd(1:29)=apmag*apbits(1:29)
else if(ncontest.eq.3) then ! Field Day else if(ncontest.eq.2) then
apmask(1:56)=1 apmask(1:28)=1
llrd(1:28)=apmag*apbits(1:28) llrd(1:28)=apmag*apbits(1:28)
llrd(29:56)=apmag*aphis_fd(1:28) else if(ncontest.eq.3) then
else if(ncontest.eq.4) then ! RTTY RU apmask(1:28)=1
apmask(2:57)=1 llrd(1:28)=apmag*apbits(1:28)
llrd(2:29)=apmag*apmy_ru(1:28) else if(ncontest.eq.4) then
llrd(30:57)=apmag*apbits(30:57) apmask(2:29)=1
llrd(2:29)=apmag*apmy_ru(1:28)
endif
endif endif
endif
if(iaptype.eq.4 .or. iaptype.eq.5 .or. iaptype.eq.6) then if(iaptype.eq.3) then ! MyCall,DxCall,???
apmask=0 apmask=0
if(ncontest.le.4) then if(ncontest.eq.0.or.ncontest.eq.1.or.ncontest.eq.2) then
apmask(1:91)=1 ! mycall, hiscall, RRR|73|RR73 apmask(1:58)=1
if(iaptype.eq.6) llrd(1:91)=apmag*apbits(1:91) llrd(1:58)=apmag*apbits(1:58)
else if(ncontest.eq.3) then ! Field Day
apmask(1:56)=1
llrd(1:28)=apmag*apbits(1:28)
llrd(29:56)=apmag*aphis_fd(1:28)
else if(ncontest.eq.4) then ! RTTY RU
apmask(2:57)=1
llrd(2:29)=apmag*apmy_ru(1:28)
llrd(30:57)=apmag*apbits(30:57)
endif
endif endif
if(iaptype.eq.4 .or. iaptype.eq.5 .or. iaptype.eq.6) then
apmask=0
if(ncontest.le.4) then
apmask(1:91)=1 ! mycall, hiscall, RRR|73|RR73
if(iaptype.eq.6) llrd(1:91)=apmag*apbits(1:91)
endif
endif
llr=llrd
endif
message77=0
dmin=0.0
call timer('bpdec174',0)
call bpdecode174_91(llr,apmask,max_iterations,message77, &
cw,nharderror,niterations)
call timer('bpdec174',1)
if(doosd .and. nharderror.lt.0) then
ndeep=3
! if(abs(nfqso-f1).le.napwid) then
! ndeep=4
! endif
call timer('osd174_91 ',0)
call osd174_91(llr,apmask,ndeep,message77,cw,nharderror,dmin)
call timer('osd174_91 ',1)
endif endif
llr=llrd if(sum(message77).eq.0) cycle
endif if( nharderror.ge.0 ) then
message77=0 message77=mod(message77+rvec,2) ! remove rvec scrambling
dmin=0.0 write(c77,'(77i1)') message77(1:77)
call timer('bpdec174',0) call unpack77(c77,1,message,unpk77_success)
call bpdecode174_91(llr,apmask,max_iterations,message77, & if(unpk77_success.and.dosubtract) then
cw,nharderror,niterations) call get_ft4_tones_from_77bits(message77,i4tone)
call timer('bpdec174',1) dt=real(ibest)/666.67
call timer('subtract',0)
if(doosd .and. nharderror.lt.0) then call subtractft4(dd,i4tone,f1,dt)
ndeep=3 call timer('subtract',1)
if(abs(nfqso-f1).le.napwid) then endif
ndeep=4 idupe=0
do i=1,ndecodes
if(decodes(i).eq.message) idupe=1
enddo
if(idupe.eq.1) exit
ndecodes=ndecodes+1
decodes(ndecodes)=message
if(snr.gt.0.0) then
xsnr=10*log10(snr)-14.8
else
xsnr=-21.0
endif
nsnr=nint(max(-21.0,xsnr))
xdt=ibest/666.67 - 0.5
!write(21,'(i6.6,i5,2x,f4.1,i6,2x,a37,2x,f4.1,3i3,f5.1,i4,i4,i4)') &
! nutc,nsnr,xdt,nint(f1),message,smax,iaptype,ipass,isp,dmin,nsync_qual,nharderror,iseg
call this%callback(smax,nsnr,xdt,f1,message,iaptype,qual)
exit
endif endif
call timer('osd174_91 ',0) enddo !Sequence estimation
call osd174_91(llr,apmask,ndeep,message77,cw,nharderror,dmin) if(nharderror.ge.0) exit
call timer('osd174_91 ',1) enddo !3 DT segments
endif
if(sum(message77).eq.0) cycle
if( nharderror.ge.0 ) then
message77=mod(message77+rvec,2) ! remove rvec scrambling
write(c77,'(77i1)') message77(1:77)
call unpack77(c77,1,message,unpk77_success)
if(unpk77_success.and.dosubtract) then
call get_ft4_tones_from_77bits(message77,i4tone)
dt=real(ibest)/666.67
call timer('subtract',0)
call subtractft4(dd,i4tone,f0,dt)
call timer('subtract',1)
endif
idupe=0
do i=1,ndecodes
if(decodes(i).eq.message) idupe=1
enddo
if(idupe.eq.1) exit
ndecodes=ndecodes+1
decodes(ndecodes)=message
if(snr.gt.0.0) then
xsnr=10*log10(snr)-14.8
else
xsnr=-21.0
endif
nsnr=nint(max(-21.0,xsnr))
xdt=ibest/666.67 - 0.5
!write(21,'(i6.6,i5,2x,f4.1,i6,2x,a37,2x,f4.1,3i3,f5.1)') nutc,nsnr,xdt,nint(f0),message,sync,iaptype,ipass,isp,dmin
call this%callback(sync,nsnr,xdt,f0,message,iaptype,qual)
exit
endif
enddo !Sequence estimation
enddo !Candidate list enddo !Candidate list
enddo !Subtraction loop enddo !Subtraction loop
return return

1
lib/jt9.f90
View File

@ -179,7 +179,6 @@ program jt9
go to 999 go to 999
endif endif
if(mode.eq.5) ndepth=3
allocate(shared_data) allocate(shared_data)
nflatten=0 nflatten=0