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

Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0

Browse Source
This commit is contained in:
Joe Taylor 2019-03-28 13:21:02 -04:00
commit 67b9f327a5
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ft4/ft4d.f90
View File

@ -11,7 +11,7 @@ program ft4d
character*4 cqstr character*4 cqstr
real*8 fMHz real*8 fMHz
integer ihdr(11) integer ihdr(11)
integer*2 iwave(180000) !15*12000 integer*2 iwave(240000) !20*12000
fs=12000.0/NDOWN !Sample rate fs=12000.0/NDOWN !Sample rate
dt=1/fs !Sample interval after downsample (s) dt=1/fs !Sample interval after downsample (s)

19
lib/ft4/getcandidates4.f90
View File

@ -27,7 +27,7 @@ subroutine getcandidates4(id,fa,fb,syncmin,nfqso,maxcand,savg,candidate, &
! Compute symbol spectra, stepping by NSTEP steps. ! Compute symbol spectra, stepping by NSTEP steps.
savg=0. savg=0.
tstep=NSTEP/12000.0 tstep=NSTEP/12000.0
df=12000.0/NFFT1 !5.86 Hz df=12000.0/NFFT1
fac=1.0/300.0 fac=1.0/300.0
do j=1,NHSYM do j=1,NHSYM
ia=(j-1)*NSTEP + 1 ia=(j-1)*NSTEP + 1
@ -55,17 +55,26 @@ subroutine getcandidates4(id,fa,fb,syncmin,nfqso,maxcand,savg,candidate, &
indx=0 indx=0
call indexx(savsm(n300:n2500),np,indx) call indexx(savsm(n300:n2500),np,indx)
xn=savsm(nfa+indx(nint(0.3*np))) xn=savsm(nfa+indx(nint(0.3*np)))
savsm=savsm/xn
ncand=0 ncand=0
if(xn.le.1.e-8) return
savsm=savsm/xn
! call ft4_baseline(savg,nfa,nfb,sbase)
! savsm=savsm/sbase
f_offset = -1.5*12000/512 f_offset = -1.5*12000/512
do i=nfa+1,nfb-1 do i=nfa+1,nfb-1
if(savsm(i).ge.savsm(i-1) .and. savsm(i).ge.savsm(i+1) .and. savsm(i).ge.syncmin) then if(savsm(i).ge.savsm(i-1) .and. savsm(i).ge.savsm(i+1) .and. &
! del=0.5*(savsm(i-1)-savsm(i+1))/(savsm(i-1)-2*savsm(i)+savsm(i+1)) savsm(i).ge.syncmin) then
den=savsm(i-1)-2*savsm(i)+savsm(i+1)
del=0. del=0.
if(den.ne.0.0) del=0.5*(savsm(i-1)-savsm(i+1))/den
fpeak=(i+del)*df+f_offset fpeak=(i+del)*df+f_offset
speak=savsm(i) - 0.25*(savsm(i-1)-savsm(i+1))*del speak=savsm(i) - 0.25*(savsm(i-1)-savsm(i+1))*del
ncand=ncand+1 ncand=ncand+1
if(ncand.gt.maxcand) then
ncand=maxcand
exit
endif
candidate(1,ncand)=fpeak candidate(1,ncand)=fpeak
candidate(2,ncand)=-99.99 candidate(2,ncand)=-99.99
candidate(3,ncand)=speak candidate(3,ncand)=speak