From a0b7f9776a4380b45260f32da758b61c15146aaf Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 27 Nov 2012 17:10:28 +0000 Subject: [PATCH] Omitted a sqrt() by mistake. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2777 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/downsam9.f90 | 7 +------ lib/symspec2.f90 | 7 +------ mainwindow.cpp | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/downsam9.f90 b/lib/downsam9.f90 index 21b216824..577645fce 100644 --- a/lib/downsam9.f90 +++ b/lib/downsam9.f90 @@ -28,13 +28,8 @@ subroutine downsam9(c0,npts8,nsps8,nspsd,fpk,c2,nz2) j=j+1 s(i)=s(i)+real(c1(j))**2 + aimag(c1(j))**2 enddo -! write(50,3000) i,(j-nadd/2)*df1,s(i) -!3000 format(i5,2f12.3) enddo call pctile(s,1000,40,avenoise) -! write(71,*) avenoise,nadd -! call flush(50) -! call flush(71) ndown=nsps8/16 !Downsample factor nfft2=nfft1/ndown !Backward FFT length @@ -42,7 +37,7 @@ subroutine downsam9(c0,npts8,nsps8,nspsd,fpk,c2,nz2) fshift=fpk-1500.0 i0=nh1 + fshift/df1 - fac=1.0/avenoise + fac=sqrt(1.0/avenoise) do i=0,nfft2-1 j=i0+i if(i.gt.nh2) j=j-nfft2 diff --git a/lib/symspec2.f90 b/lib/symspec2.f90 index 70afb79ee..847780857 100644 --- a/lib/symspec2.f90 +++ b/lib/symspec2.f90 @@ -49,13 +49,8 @@ subroutine symspec2(c5,nz3,nsps8,nspsd,fsample,snrdb,i1SoftSymbolsScrambled) sig=sig/69. df8=1500.0/nsps8 -! t=max(1.0,sig/xmed - 1.0) -! snrdb=db(t) - db(2500.0/df8) - 4.5 t=max(1.0,sig - 1.0) - snrdb=db(t) - 60.3 -! write(71,3001) ave,xmed,sig,db(sig),t,snrdb -!3001 format(6f12.2) -! call flush(71) + snrdb=db(t) - 61.3 m0=3 k=0 diff --git a/mainwindow.cpp b/mainwindow.cpp index 04b7626f6..b1642789c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"