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

Simplify some code in fst4_decode.f90 - no functional change.

This commit is contained in:
Steven Franke 2020-08-19 09:20:48 -05:00
parent 2c0462f9aa
commit 07486ee0c7
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/fst4_decode.f90
View File

@ -48,7 +48,7 @@ contains
complex, allocatable :: c2(:) complex, allocatable :: c2(:)
complex, allocatable :: cframe(:) complex, allocatable :: cframe(:)
complex, allocatable :: c_bigfft(:) !Complex waveform complex, allocatable :: c_bigfft(:) !Complex waveform
real llr(240),llra(240),llrb(240),llrc(240),llrd(240) real llr(240),llrs(240,4)
real candidates(200,4) real candidates(200,4)
real bitmetrics(320,4) real bitmetrics(320,4)
real s4(0:3,NN) real s4(0:3,NN)
@ -415,28 +415,15 @@ contains
if(nsync_qual.lt. 46) cycle !### Value ?? ### if(nsync_qual.lt. 46) cycle !### Value ?? ###
scalefac=2.83 scalefac=2.83
llra( 1: 60)=bitmetrics( 17: 76, 1) do il=1,4
llra( 61:120)=bitmetrics( 93:152, 1) llrs( 1: 60,il)=bitmetrics( 17: 76, il)
llra(121:180)=bitmetrics(169:228, 1) llrs( 61:120,il)=bitmetrics( 93:152, il)
llra(181:240)=bitmetrics(245:304, 1) llrs(121:180,il)=bitmetrics(169:228, il)
llra=scalefac*llra llrs(181:240,il)=bitmetrics(245:304, il)
llrb( 1: 60)=bitmetrics( 17: 76, 2) enddo
llrb( 61:120)=bitmetrics( 93:152, 2) llrs=scalefac*llrs
llrb(121:180)=bitmetrics(169:228, 2)
llrb(181:240)=bitmetrics(245:304, 2)
llrb=scalefac*llrb
llrc( 1: 60)=bitmetrics( 17: 76, 3)
llrc( 61:120)=bitmetrics( 93:152, 3)
llrc(121:180)=bitmetrics(169:228, 3)
llrc(181:240)=bitmetrics(245:304, 3)
llrc=scalefac*llrc
llrd( 1: 60)=bitmetrics( 17: 76, 4)
llrd( 61:120)=bitmetrics( 93:152, 4)
llrd(121:180)=bitmetrics(169:228, 4)
llrd(181:240)=bitmetrics(245:304, 4)
llrd=scalefac*llrd
apmag=maxval(abs(llra))*1.1 apmag=maxval(abs(llrs(:,1)))*1.1
ntmax=nblock+nappasses(nQSOProgress) ntmax=nblock+nappasses(nQSOProgress)
if(lapcqonly) ntmax=nblock+1 if(lapcqonly) ntmax=nblock+1
if(ndepth.eq.1) ntmax=nblock if(ndepth.eq.1) ntmax=nblock
@ -448,22 +435,22 @@ contains
endif endif
do itry=1,ntmax do itry=1,ntmax
if(itry.eq.1) llr=llra if(itry.eq.1) llr=llrs(:,1)
if(itry.eq.2.and.itry.le.nblock) llr=llrb if(itry.eq.2.and.itry.le.nblock) llr=llrs(:,2)
if(itry.eq.3.and.itry.le.nblock) llr=llrc if(itry.eq.3.and.itry.le.nblock) llr=llrs(:,3)
if(itry.eq.4.and.itry.le.nblock) llr=llrd if(itry.eq.4.and.itry.le.nblock) llr=llrs(:,4)
if(itry.le.nblock) then if(itry.le.nblock) then
apmask=0 apmask=0
iaptype=0 iaptype=0
endif endif
if(itry.gt.nblock) then if(itry.gt.nblock) then
llr=llra llr=llrs(:,1)
if(nblock.gt.1) then if(nblock.gt.1) then
if(hmod.eq.1) llr=llrc if(hmod.eq.1) llr=llrs(:,3)
if(hmod.eq.2) llr=llra if(hmod.eq.2) llr=llrs(:,1)
if(hmod.eq.4) llr=llrb if(hmod.eq.4) llr=llrs(:,2)
if(hmod.eq.8) llr=llrc if(hmod.eq.8) llr=llrs(:,4)
endif endif
iaptype=naptypes(nQSOProgress,itry-nblock) iaptype=naptypes(nQSOProgress,itry-nblock)
if(lapcqonly) iaptype=1 if(lapcqonly) iaptype=1