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

Working on tweaks to the Fast/Normal/Deep decoding options.

Browse Source
This commit is contained in:
Joe Taylor 2021-02-23 11:32:38 -05:00
parent a8200fdfdd
commit 0765a1cc06
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/q65_decode.f90
View File

@ -241,13 +241,13 @@ contains
if(c6.eq.' ') c6='<b> ' if(c6.eq.' ') c6='<b> '
c4=hisgrid(1:4) c4=hisgrid(1:4)
if(c4.eq.' ') c4='<b> ' if(c4.eq.' ') c4='<b> '
fmt='(i6.4,1x,a4,5i2,4i3,f6.2,f7.1,f7.2,f6.1,f6.2,'// & fmt='(i6.4,1x,a4,5i2,5i3,f6.2,f7.1,f7.2,f6.1,f6.2,'// &
'1x,a6,1x,a6,1x,a4,1x,a)' '1x,a6,1x,a6,1x,a4,1x,a)'
if(ntrperiod.le.30) fmt(5:5)='6' if(ntrperiod.le.30) fmt(5:5)='6'
if(idec.eq.3) nrc=0 if(idec.eq.3) nrc=0
write(22,fmt) nutc,cmode,nQSOprogress,idec,idf,idt,ibw,nused, & write(22,fmt) nutc,cmode,nQSOprogress,idec,ndist,idf,idt,ibw, &
icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode,mycall(1:6), & nused,icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode, &
c6,c4,trim(decoded) mycall(1:6),c6,c4,trim(decoded)
close(22) close(22)
endif endif
! else ! else
@ -323,13 +323,14 @@ contains
if(c6.eq.' ') c6='<b> ' if(c6.eq.' ') c6='<b> '
c4=hisgrid(1:4) c4=hisgrid(1:4)
if(c4.eq.' ') c4='<b> ' if(c4.eq.' ') c4='<b> '
fmt='(i6.4,1x,a4,5i2,4i3,f6.2,f7.1,f7.2,f6.1,f6.2,'// & fmt='(i6.4,1x,a4,5i2,5i3,f6.2,f7.1,f7.2,f6.1,f6.2,'// &
'1x,a6,1x,a6,1x,a4,1x,a)' '1x,a6,1x,a6,1x,a4,1x,a)'
if(ntrperiod.le.30) fmt(5:5)='6' if(ntrperiod.le.30) fmt(5:5)='6'
if(idec.eq.3) nrc=0 if(idec.eq.3) nrc=0
write(22,fmt) nutc,cmode,nQSOprogress,idec,idf,idt,ibw,nused, & write(22,fmt) nutc,cmode,nQSOprogress,idec,ndist,idf,idt,ibw, &
icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode,mycall(1:6), & nused,icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode, &
c6,c4,trim(decoded) mycall(1:6),c6,c4,trim(decoded)
close(22) close(22)
endif endif
endif endif

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

@ -11,7 +11,7 @@ module q65
38,46,50,55,60,62,66,69,74,76,85/) 38,46,50,55,60,62,66,69,74,76,85/)
integer codewords(63,206) integer codewords(63,206)
integer ibwa,ibwb,ncw,nsps,mode_q65,nfa,nfb integer ibwa,ibwb,ncw,nsps,mode_q65,nfa,nfb
integer idf,idt,ibw integer idf,idt,ibw,ndist
integer istep,nsmo,lag1,lag2,npasses,nused,iseq,ncand,nrc integer istep,nsmo,lag1,lag2,npasses,nused,iseq,ncand,nrc
integer i0,j0 integer i0,j0
integer navg(0:1) integer navg(0:1)

8
lib/qra/q65/q65_loops.f90
View File

@ -26,13 +26,13 @@ subroutine q65_loops(c00,npts2,nsps2,nsubmode,ndepth,jpk0, &
idfmax=3 idfmax=3
idtmax=3 idtmax=3
ibw0=(ibwa+ibwb)/2 ibw0=(ibwa+ibwb)/2
maxdist=5 maxdist=2
if(iand(ndepth,3).ge.2) then if(iand(ndepth,3).ge.2) then
idfmax=5 idfmax=5
idtmax=5 idtmax=5
maxdist=10 maxdist=3
endif endif
if(iand(ndepth,3).eq.3) maxdist=15 if(iand(ndepth,3).eq.3) maxdist=4
LL=64*(mode_q65+2) LL=64*(mode_q65+2)
napmin=99 napmin=99
@ -58,7 +58,7 @@ subroutine q65_loops(c00,npts2,nsps2,nsubmode,ndepth,jpk0, &
where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
call q65_bzap(s3,LL) !Zap birdies call q65_bzap(s3,LL) !Zap birdies
do ibw=ibwa,ibwb do ibw=ibwa,ibwb
ndist=ndf**2 + ndt**2 + (ibw-ibw0)**2 ndist=sqrt(float(ndf**2 + ndt**2 + (ibw-ibw0)**2))
if(ndist.gt.maxdist) cycle if(ndist.gt.maxdist) cycle
b90=1.72**ibw b90=1.72**ibw
if(b90.gt.345.0) cycle if(b90.gt.345.0) cycle