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

Use dd in sync8, in anticipation of multiple detection/decoding passes.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7789 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2017-07-06 15:45:25 +00:00
parent 6047eb1937
commit e71ce01ab1
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/fsk4hf/subtractft8.f90
View File

@ -10,8 +10,8 @@ subroutine subtractft8(dd,itone,f0,dt)
use timer_module, only: timer use timer_module, only: timer
parameter (NMAX=15*12000,NFRAME=1920*79) parameter (NMAX=15*12000,NFRAME=1920*79)
parameter (NFFT=NMAX,NFILT=1000) parameter (NFFT=NMAX,NFILT=400)
real*4 dd(NMAX),dds(NMAX), window(-NFILT/2:NFILT/2) real*4 dd(NMAX), window(-NFILT/2:NFILT/2)
complex cref,camp,cfilt,cw complex cref,camp,cfilt,cw
integer itone(79) integer itone(79)
logical first logical first
@ -50,17 +50,12 @@ subroutine subtractft8(dd,itone,f0,dt)
cfilt(1:nfft)=cfilt(1:nfft)*cw(1:nfft) cfilt(1:nfft)=cfilt(1:nfft)*cw(1:nfft)
call four2a(cfilt,nfft,1,1,1) call four2a(cfilt,nfft,1,1,1)
dds=dd
! Subtract the reconstructed signal ! Subtract the reconstructed signal
do i=1,nframe do i=1,nframe
j=nstart+i-1 j=nstart+i-1
if(j.ge.1 .and. j.le.NMAX) dd(j)=dd(j)-2*REAL(cfilt(i)*cref(i)) if(j.ge.1 .and. j.le.NMAX) dd(j)=dd(j)-2*REAL(cfilt(i)*cref(i))
enddo enddo
!do i=1,NMAX
!write(34,*) i,dds(i),dd(i)
!enddo
return return
end subroutine subtractft8 end subroutine subtractft8

6
lib/fsk4hf/sync8.f90
View File

@ -1,4 +1,4 @@
subroutine sync8(iwave,nfa,nfb,nfqso,s,candidate,ncand) subroutine sync8(dd,nfa,nfb,nfqso,s,candidate,ncand)
include 'ft8_params.f90' include 'ft8_params.f90'
parameter (JZ=31) !DT up to +/- 2.5 s parameter (JZ=31) !DT up to +/- 2.5 s
@ -10,7 +10,7 @@ subroutine sync8(iwave,nfa,nfb,nfqso,s,candidate,ncand)
real red(NH1) real red(NH1)
real candidate0(3,100) real candidate0(3,100)
real candidate(3,100) real candidate(3,100)
integer*2 iwave(NMAX) real dd(NMAX)
integer jpeak(NH1) integer jpeak(NH1)
integer indx(NH1) integer indx(NH1)
integer ii(1) integer ii(1)
@ -29,7 +29,7 @@ subroutine sync8(iwave,nfa,nfb,nfqso,s,candidate,ncand)
do j=1,NHSYM do j=1,NHSYM
ia=(j-1)*istep + 1 ia=(j-1)*istep + 1
ib=ia+NSPS-1 ib=ia+NSPS-1
x(1:NSPS)=fac*iwave(ia:ib) x(1:NSPS)=fac*dd(ia:ib)
x(NSPS+1:)=0. x(NSPS+1:)=0.
call four2a(x,NFFT1,1,-1,0) !r2c FFT call four2a(x,NFFT1,1,-1,0) !r2c FFT
do i=1,NH1 do i=1,NH1

5
lib/ft8_decode.f90
View File

@ -43,11 +43,12 @@ contains
write(datetime,1001) nutc !### TEMPORARY ### write(datetime,1001) nutc !### TEMPORARY ###
1001 format("000000_",i6.6) 1001 format("000000_",i6.6)
dd=iwave
call timer('sync8 ',0) call timer('sync8 ',0)
call sync8(iwave,nfa,nfb,nfqso,s,candidate,ncand) call sync8(dd,nfa,nfb,nfqso,s,candidate,ncand)
call timer('sync8 ',1) call timer('sync8 ',1)
dd=iwave
syncmin=2.0 syncmin=2.0
! rewind 51 ! rewind 51
do icand=1,ncand do icand=1,ncand