w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Default parameter settings for JT65 decoding set for HF conditions. 

More aggressive parameters are selected with higher values of 
"Aggressive decoding level" on the "Advanced" tab.  With settings
greater than 0, be sure to set Ftol=1000 if you want to decode over 
the whole passband.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6330 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2015-12-31 16:22:27 +00:00
parent 696f633bf6
commit 0e15a4cd5c
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ftrsd/ftrsd2.c
View File

@ -209,9 +209,8 @@ NB: j is the symbol-vector index of the symbol with rank i.
} else {
if(pp>pp2 && pp!=pp1) pp2=pp;
}
// if(pp2==0.0 && pp1>5.0) break;
// if(pp2>0.0 && pp1>4.4 && pp1>pp2+0.6) break;
if(ntotal_min <= 81 && pp2/pp1 <= 0.87) break;
// if(ntotal_min <= 81 && pp2/pp1 <= 0.87) break;
if(nhard_min <= 41 && ntotal_min <= 71) break;
}
if(k == ntrials) ntry[0]=k;
}

29
lib/jt65_decode.f90
View File

@ -75,10 +75,20 @@ contains
end type accepted_decode
type(accepted_decode) dec(50)
logical :: first_time, robust
integer h0(0:11),d0(0:11),ne(0:11)
real r0(0:11)
common/decstats/ntry65a,ntry65b,n65a,n65b,num9,numfano
common/steve/thresh0
common/test000/ncandidates,nhard_min,nsoft_min,nera_best,nrtt1000, &
ntotal_min,ntry,nq1000,npp1 !### TEST ONLY ###
! 0 1 2 3 4 5 6 7 8 9 10 11
data h0/41,42,43,43,44,45,46,47,48,48,49,49/
data d0/71,72,73,74,76,77,78,80,81,82,83,83/
! 0 1 2 3 4 5 6 7 8 9 10 11
data r0/0.70,0.72,0.74,0.76,0.78,0.80,0.82,0.84,0.86,0.88,0.90,0.90/
save
this%callback => callback
@ -153,13 +163,20 @@ contains
naggressive,ndepth,mycall,hiscall,hisgrid,nexp_decode, &
sync2,a,dtx,nft,qual,nhist,decoded)
call timer('decod65a',1)
if(nhard_min.gt.50) cycle
!### Suppress false decodes in crowded HF bands ###
if(naggressive.eq.0 .and. ntrials.le.10000) then
if(ntry.eq.ntrials .or. ncandidates.eq.100) then
if(nhard_min.ge.42 .or. ntotal_min.ge.71) cycle
endif
endif
n=naggressive
rtt=0.001*nrtt1000
if(nhard_min.gt.h0(n)) cycle
if(ntotal_min.gt.d0(n)) cycle
if(rtt.gt.r0(n)) cycle
! !### Suppress false decodes in crowded HF bands ###
! if(naggressive.eq.0 .and. ntrials.le.10000) then
! if(ntry.eq.ntrials) then
! if(nhard_min.ge.42 .or. ntotal_min.ge.71) cycle
! endif
! endif
if(decoded.eq.decoded0 .and. abs(freq-freq0).lt. 3.0 .and. &
minsync.ge.0) cycle !Don't display dupes