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

Further progress toward correct message averaging and hinted decoding

Browse Source 
in JT65 mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6522 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-03-10 20:29:00 +00:00
parent 7a1a61b7d7
commit 94fa87be0b
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/decode65a.f90
View File

@ -130,7 +130,7 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials, &
decoded=decoded_best decoded=decoded_best
qual=qualbest qual=qualbest
nsmo=nsmobest nsmo=nsmobest
! print*,'B',nnbest,nsmo,qual,decoded param(9)=nsmo
endif endif
call timer('dec65b ',1) call timer('dec65b ',1)

23
lib/jt65_decode.f90
View File

@ -179,7 +179,6 @@ contains
! ntry=param(6) ! ntry=param(6)
! nq1000=param(7) ! nq1000=param(7)
! npp1=param(8) ! npp1=param(8)
nsmo=param(9) nsmo=param(9)
nfreq=nint(freq+a(1)) nfreq=nint(freq+a(1))
@ -198,12 +197,10 @@ contains
nsave=nsave+1 nsave=nsave+1
nsave=mod(nsave-1,64)+1 nsave=mod(nsave-1,64)+1
call avg65(nutc,nsave,sync1,dtx,nflip,nfreq,mode65,ntol, & call avg65(nutc,nsave,sync1,dtx,nflip,nfreq,mode65,ntol, &
ndepth,nclearave,neme,mycall,hiscall,hisgrid,nftt, & ndepth,ntrials,naggressive,nclearave,neme,mycall, &
avemsg,qave,deepave,nsum,ndeepave) hiscall,hisgrid,nftt,avemsg,qave,deepave,nsum,ndeepave)
if (associated(this%callback)) then if (associated(this%callback)) then
! print*,'FT1 failed; nsave,nftt: ',nsave,nftt
! print*,'A',nftt,nsum,nsmo
call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, & call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, &
avemsg,nftt,nqual,nsmo,nsum,minsync,nsubmode, & avemsg,nftt,nqual,nsmo,nsum,minsync,nsubmode, &
naggressive) naggressive)
@ -229,7 +226,6 @@ contains
5 if(decoded.eq.decoded0 .and. abs(freq-freq0).lt. 3.0 .and. & 5 if(decoded.eq.decoded0 .and. abs(freq-freq0).lt. 3.0 .and. &
minsync.ge.0) cycle !Don't display dupes minsync.ge.0) cycle !Don't display dupes
if(decoded.ne.' ' .or. minsync.lt.0) then if(decoded.ne.' ' .or. minsync.lt.0) then
if( nsubtract .eq. 1 ) then if( nsubtract .eq. 1 ) then
call timer('subtr65 ',0) call timer('subtr65 ',0)
@ -255,7 +251,6 @@ contains
dec(ndecoded)%decoded=decoded dec(ndecoded)%decoded=decoded
nqual=min(qual,9999.0) nqual=min(qual,9999.0)
if (associated(this%callback)) then if (associated(this%callback)) then
! print*,'B',nsave,nft,nsmo,nsum
call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, & call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, &
decoded,nft,nqual,nsmo,nsum,minsync,nsubmode, & decoded,nft,nqual,nsmo,nsum,minsync,nsubmode, &
naggressive) naggressive)
@ -273,8 +268,8 @@ contains
end subroutine decode end subroutine decode
subroutine avg65(nutc,nsave,snrsync,dtxx,nflip,nfreq,mode65,ntol,ndepth, & subroutine avg65(nutc,nsave,snrsync,dtxx,nflip,nfreq,mode65,ntol,ndepth, &
nclearave,neme,mycall,hiscall,hisgrid,nftt,avemsg,qave,deepave, & ntrials,naggressive,nclearave,neme,mycall,hiscall,hisgrid,nftt, &
nsum,ndeepave) avemsg,qave,deepave,nsum,ndeepave)
! Decodes averaged JT65 data ! Decodes averaged JT65 data
@ -389,15 +384,7 @@ contains
nadd=nsum*mode65 nadd=nsum*mode65
nftt=0 nftt=0
!### ! nexp_decode=0 !### not used, anyway
ntrials=3000
naggressive=10
hiscall='W9XYZ'
hisgrid='EN37'
nexp_decode=0 !### not used, anyway
!###
! print*,'A',nadd,mode65,ntrials,naggressive,ndepth,mycall, &
! hiscall,hisgrid,nexp_decode
call extract(s3b,nadd,mode65,ntrials,naggressive,ndepth,mycall, & call extract(s3b,nadd,mode65,ntrials,naggressive,ndepth,mycall, &
hiscall,hisgrid,nexp_decode,ncount,nhist,avemsg,ltext,nftt,qual) hiscall,hisgrid,nexp_decode,ncount,nhist,avemsg,ltext,nftt,qual)