w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-30 20:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the reporting of SNR for Q65 average decodes.

Browse Source
This commit is contained in:
Joe Taylor 2020-12-30 11:02:49 -05:00
parent 412422db17
commit 91687c573b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/q65_decode.f90
View File

@ -161,7 +161,7 @@ contains
! No single-transmission decode. ! No single-transmission decode.
if(iand(ndepth,16).eq.16) then if(iand(ndepth,16).eq.16) then
call q65_avg2(ntrperiod,ntol,baud,nsubmode,ibwa,ibwb,codewords,ncw, & call q65_avg2(ntrperiod,ntol,baud,nsubmode,ibwa,ibwb,codewords,ncw, &
xdt,f0,snr1,dat4,idec) xdt,f0,snr1,snr2,dat4,idec)
endif endif
100 decoded=' ' 100 decoded=' '

10
lib/qra/q65/q65_avg.f90
View File

@ -66,7 +66,7 @@ subroutine q65_avg(nutc,ntrperiod,LL,ntol,lclearave,xdt,f0,snr1,s3)
10 return 10 return
entry q65_avg2(ntrperiod,ntol,baud,nsubmode,ibwa,ibwb,codewords,ncw, & entry q65_avg2(ntrperiod,ntol,baud,nsubmode,ibwa,ibwb,codewords,ncw, &
xdt,f0,snr1,dat4,idec) xdt,f0,snr1,snr2,dat4,idec)
mode_q65=2**nsubmode mode_q65=2**nsubmode
ibwa=1.8*log(baud*mode_q65) + 2 ibwa=1.8*log(baud*mode_q65) + 2
@ -114,7 +114,6 @@ subroutine q65_avg(nutc,ntrperiod,LL,ntol,lclearave,xdt,f0,snr1,s3)
xdtsave(i),f0save(i) xdtsave(i),f0save(i)
1001 format(a1,i5.4,f6.1,f6.2,f7.1) 1001 format(a1,i5.4,f6.1,f6.2,f7.1)
enddo enddo
! if(navg.lt.2) go to 900 !Must have at least 2
s3avg=s3avg/navg s3avg=s3avg/navg
nFadingModel=1 nFadingModel=1
@ -125,7 +124,8 @@ subroutine q65_avg(nutc,ntrperiod,LL,ntol,lclearave,xdt,f0,snr1,s3)
! irc=-99 !### TEMPORARY ### ! irc=-99 !### TEMPORARY ###
if(irc.ge.0 .and. plog.ge.PLOG_MIN) then if(irc.ge.0 .and. plog.ge.PLOG_MIN) then
snr2=esnodb - db(2500.0/baud) + 3.0 !Empirical adjustment snr2=esnodb - db(2500.0/baud) + 3.0 !Empirical adjustment
idec=10+navg !### snr2=snr2 - db(float(navg)) !Is this right?
idec=10+navg
! print*,'C dec1 ',ibw,irc,idec,avemsg ! print*,'C dec1 ',ibw,irc,idec,avemsg
go to 900 go to 900
endif endif
@ -140,8 +140,10 @@ subroutine q65_avg(nutc,ntrperiod,LL,ntol,lclearave,xdt,f0,snr1,s3)
b90ts=b90/baud b90ts=b90/baud
call q65_dec2(s3avg,nsubmode,b90ts,esnodb,irc,dat4,avemsg) call q65_dec2(s3avg,nsubmode,b90ts,esnodb,irc,dat4,avemsg)
if(irc.ge.0) then if(irc.ge.0) then
snr2=esnodb - db(2500.0/baud) + 3.0 !Empirical adjustment
snr2=snr2 - db(float(navg)) !Is this right?
idec=10*(iaptype+2) + navg idec=10*(iaptype+2) + navg
! print*,'D dec2 ',ibw,irc,avemsg ! print*,'D dec2 ',ibw,dec,snr2,avemsg
go to 900 go to 900
endif endif
enddo ! ibw (b90 loop) enddo ! ibw (b90 loop)