w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-24 22:25:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a flaw in ft8sim. De-activate the calls to plotspec() in foxfilt.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8317 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-12 20:15:36 +00:00
parent 5cadbe26aa
commit 84b38ee0ad
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ft8/foxfilt.f90
View File

@ -1,4 +1,4 @@
subroutine foxfilt(nslots,wave) subroutine foxfilt(nslots,width,wave)
parameter (NN=79,ND=58,KK=87,NSPS=4*1920) parameter (NN=79,ND=58,KK=87,NSPS=4*1920)
parameter (NWAVE=NN*NSPS,NFFT=614400,NH=NFFT/2) parameter (NWAVE=NN*NSPS,NFFT=614400,NH=NFFT/2)
@ -13,7 +13,6 @@ subroutine foxfilt(nslots,wave)
df=48000.0/NFFT df=48000.0/NFFT
fa=1800.0 - 0.5*6.25 fa=1800.0 - 0.5*6.25
fb=1800.0 + 7.5*6.25 + (nslots-1)*60.0 fb=1800.0 + 7.5*6.25 + (nslots-1)*60.0
width=25.0
ia2=nint(fa/df) ia2=nint(fa/df)
ib1=nint(fb/df) ib1=nint(fb/df)
ia1=nint(ia2-width/df) ia1=nint(ia2-width/df)

23
lib/ft8/foxgen.f90
View File

@ -113,7 +113,7 @@ subroutine foxgen()
peak1=maxval(abs(wave)) peak1=maxval(abs(wave))
wave=wave/peak1 wave=wave/peak1
! call plotspec(1,wave) !Plot the spectrum call plotspec(1,wave) !Plot the spectrum
! Apply compression ! Apply compression
! rms=sqrt(dot_product(wave,wave)/kz) ! rms=sqrt(dot_product(wave,wave)/kz)
@ -124,15 +124,26 @@ subroutine foxgen()
! peak2=maxval(abs(wave)) ! peak2=maxval(abs(wave))
! wave=wave/peak2 ! wave=wave/peak2
! call plotspec(2,wave) !Plot the spectrum call plotspec(2,wave) !Plot the spectrum
call foxfilt(nslots,wave) width=50.0
call foxfilt(nslots,width,wave)
peak3=maxval(abs(wave)) peak3=maxval(abs(wave))
wave=wave/peak3 wave=wave/peak3
! call plotspec(3,wave) !Plot the spectrum nadd=1000
print*,nwave,nadd,nwave/nadd,peak3
j=0
do i=1,NWAVE,nadd
sx=dot_product(wave(i:i+nadd-1),wave(i:i+nadd-1))
j=j+1
write(30,3001) j,sx/nadd
3001 format(i8,f12.6)
enddo
call plotspec(3,wave) !Plot the spectrum
return return
end subroutine foxgen end subroutine foxgen
!include 'plotspec.f90' include 'plotspec.f90'

2
lib/ft8/ft8sim.f90
View File

@ -70,7 +70,7 @@ program ft8sim
txt=NN*NSPS/12000.0 txt=NN*NSPS/12000.0
! Source-encode, then get itone() ! Source-encode, then get itone()
if(index(msg32,';').lt.0) then if(index(msg32,';').le.0) then
i3bit=0 i3bit=0
msg=msg32(1:22) msg=msg32(1:22)
call genft8(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone) call genft8(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone)