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

Fix snr calculation; remove diagnostic write.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7683 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-05-17 13:30:32 +00:00
parent 3099147891
commit 22e45c24e6
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fsk4hf/spec8.f90
View File

@ -22,10 +22,10 @@ subroutine spec8(c,s,savg)
enddo enddo
s=s/NZ s=s/NZ
savg=savg/(NN*NZ) savg=savg/(NN*NZ)
do i=0,NH2 ! do i=0,NH2
write(31,3101) i*df,savg(i) ! write(31,3101) i*df,savg(i)
3101 format(f10.3,f12.3) !3101 format(f10.3,f12.3)
enddo ! enddo
return return
end subroutine spec8 end subroutine spec8

13
lib/fsk4hf/wspr_fsk8d.f90
View File

@ -27,6 +27,7 @@ program wspr_fsk8d
real s(0:NH2,NN) real s(0:NH2,NN)
real savg(0:NH2) real savg(0:NH2)
real ss(0:N7) real ss(0:N7)
real ss0(0:N7)
real ps(0:7) real ps(0:7)
integer ihdr(11) integer ihdr(11)
integer*2 iwave(NMAX) !Generated full-length waveform integer*2 iwave(NMAX) !Generated full-length waveform
@ -100,7 +101,6 @@ program wspr_fsk8d
call four2a(c1,2*N7,1,-1,1) call four2a(c1,2*N7,1,-1,1)
call four2a(c2,2*N7,1,-1,1) call four2a(c2,2*N7,1,-1,1)
do i=0,N7 do i=0,N7
f=1500.0 + i*df1
p=1.e-9*(real(c1(i))**2 + aimag(c1(i))**2 + & p=1.e-9*(real(c1(i))**2 + aimag(c1(i))**2 + &
real(c2(i))**2 + aimag(c2(i))**2) real(c2(i))**2 + aimag(c2(i))**2)
ss(i)=p ss(i)=p
@ -110,15 +110,16 @@ program wspr_fsk8d
jpk=j0 jpk=j0
endif endif
enddo enddo
if(jpk.eq.j0) ss0=ss
enddo enddo
f0=ipk*df1 f0=ipk*df1
xdt=jpk*dt - 1.0 xdt=jpk*dt - 1.0
sp3n=(ss(ipk-1)+ss(ipk)+ss(ipk+1)) !Sig + 3*noise sp3n=(ss0(ipk-1)+ss0(ipk)+ss0(ipk+1)) !Sig + 3*noise
call pctile(ss,N7,45,base) call pctile(ss0,N7,45,base)
psig=sp3n-3*base !Sig only psig=sp3n-3*base !Sig only
pnoise=(2500.0/df1)*base !Noise in 2500 Hz pnoise=(2500.0/df1)*base !Noise in 2500 Hz
xsnr=db(psig/pnoise) !SNR from sync tones xsnr=db(psig/pnoise) !SNR from sync tones
if(jpk.ge.0) c(0:NMAXD-1-jpk)=c(jpk:NMAX-1) if(jpk.ge.0) c(0:NMAXD-1-jpk)=c(jpk:NMAX-1)