From 12ec6cae7dacf72723c718f15da1357fbd1e31bd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 14 Nov 2012 17:17:02 +0000 Subject: [PATCH] Tweaking the scaling of red curve. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2730 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/ftnquit.f90 | 9 --------- lib/redsync.f90 | 6 ++++++ lib/sync9.f90 | 1 - mainwindow.cpp | 2 +- plotter.cpp | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 lib/ftnquit.f90 diff --git a/lib/ftnquit.f90 b/lib/ftnquit.f90 deleted file mode 100644 index f209d1b4b..000000000 --- a/lib/ftnquit.f90 +++ /dev/null @@ -1,9 +0,0 @@ -subroutine ftnquit - -! Destroy the FFTW plans - call four2a(a,-1,1,1,1) - call filbig(id,-1,f0,newdat,nfsample,c4a,c4b,n4) - stop - - return -end subroutine ftnquit diff --git a/lib/redsync.f90 b/lib/redsync.f90 index ddf71d06d..fe36bde0f 100644 --- a/lib/redsync.f90 +++ b/lib/redsync.f90 @@ -28,6 +28,12 @@ subroutine redsync(ss,ntrperiod,ihsym,iz,red) call pctile(red,iz,50,xmed) if(xmed.le.0.0) xmed=1.0 red=red/xmed + smax=0. + do i=1,iz + smax=max(smax,red(i)) + enddo + h=50. + if(smax.gt.h) red=red*(h/smax) return end subroutine redsync diff --git a/lib/sync9.f90 b/lib/sync9.f90 index 6b174ec12..502a3aa54 100644 --- a/lib/sync9.f90 +++ b/lib/sync9.f90 @@ -27,7 +27,6 @@ subroutine sync9(ss,tstep,df3,ntol,nfqso,ccfred,ia,ib,ipkbest) sum=0. do j=1,16 k=ii2(j) + lag -! if(k.ge.1) sum=sum + ss(k,i) if(k.ge.1) sum=sum + ss(k,i) - 0.5*(ss(k+2,i)+ss(k+4,i)) enddo if(sum.gt.smax) then diff --git a/mainwindow.cpp b/mainwindow.cpp index c4ba0ba8b..885a272cd 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/plotter.cpp b/plotter.cpp index 4f696a75c..b32b42a48 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -127,7 +127,7 @@ void CPlotter::draw(float swide[], float red[], int i0) //draw() y2=0; if(m_bCurrent) y2 = gain*y + 30; if(m_bCumulative) y2=3*gain*10.0*log10(jt9com_.savg[i]); - if(m_bJT9Sync) y2=0.1*gain*red[i] - 20; + if(m_bJT9Sync) y2=3.0*gain*red[i] - 20; if(strong != strong0 or i==m_w-1) { painter2D.drawPolyline(LineBuf,j); j=0;