w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct offset in (i,j) indices for selecting s3 from s1.

Browse Source
This commit is contained in:
Joe Taylor 2020-12-01 11:23:35 -05:00
parent 70e0a84fe8
commit 6b540aaad0
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/q65_sync.f90
View File

@ -79,7 +79,6 @@ subroutine q65_sync(iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
i0=nint(nfqso/df) !Target QSO frequency i0=nint(nfqso/df) !Target QSO frequency
call pctile(s1(i0-64:i0+192,1:jz),129*jz,40,base) call pctile(s1(i0-64:i0+192,1:jz),129*jz,40,base)
! s1=s1/base - 1.0
s1=s1/base s1=s1/base
! Apply fast AGC ! Apply fast AGC
@ -107,6 +106,7 @@ subroutine q65_sync(iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
ipk=0 ipk=0
jpk=0 jpk=0
ccf_best=0. ccf_best=0.
imsg_best=-1
do imsg=1,ncw do imsg=1,ncw
i=1 i=1
k=0 k=0
@ -140,12 +140,16 @@ subroutine q65_sync(iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
jpk=ijpk(2)-53-1 jpk=ijpk(2)-53-1
f0=nfqso + ipk*df f0=nfqso + ipk*df
xdt=jpk*dtstep xdt=jpk*dtstep
imsg_best=imsg
endif endif
enddo ! imsg enddo ! imsg
ia=i0+ipk-63 write(71,3071) imsg_best,ipk,jpk,xdt,f0,ccf_best
3071 format(3i5,3f10.2)
ia=i0+ipk-64
ib=ia+LL-1 ib=ia+LL-1
j=j0+jpk-5 j=j0+jpk-7
n=0 n=0
do k=1,85 do k=1,85
j=j+8 j=j+8
@ -156,6 +160,13 @@ subroutine q65_sync(iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
if(j.ge.1 .and. j.le.jz) s3(-64:LL-65,n)=s1(ia:ib,j) if(j.ge.1 .and. j.le.jz) s3(-64:LL-65,n)=s1(ia:ib,j)
enddo enddo
write(73,3001) codewords(1:10,3)
3001 format(3x,10i7)
do i=-5,68
write(73,3073) i,(s3(i,j),j=1,10)
3073 format(i3,10f7.1)
enddo
nsubmode=0 nsubmode=0
if(mode_q65.eq.2) nsubmode=1 if(mode_q65.eq.2) nsubmode=1
if(mode_q65.eq.4) nsubmode=2 if(mode_q65.eq.4) nsubmode=2
@ -167,6 +178,8 @@ subroutine q65_sync(iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
b90=1.72**ibw b90=1.72**ibw
call q65_intrinsics_ff(s3,nsubmode,b90/baud,nFadingModel,s3prob) call q65_intrinsics_ff(s3,nsubmode,b90/baud,nFadingModel,s3prob)
call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc) call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc)
write(72,3072) ibw,dat4,plog,irc
3072 format(i2,2x,13i3,f8.1,i5)
if(irc.ge.0) then if(irc.ge.0) then
snr2=esnodb - db(2500.0/baud) snr2=esnodb - db(2500.0/baud)
id1=1 id1=1