From 8f9e5283a2d3bcf64d2c7d23b921af43c3a80a07 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 17 May 2013 15:16:29 +0000 Subject: [PATCH] Removed red3, was not useful. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3280 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decoder.f90 | 14 +++++++++----- lib/sync9.f90 | 6 +----- mainwindow.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index b015022b6..dbd252d40 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -11,7 +11,6 @@ subroutine decoder(ss,c0,nstandalone) character*20 datetime real*4 ccfred(NSMAX) real*4 red2(NSMAX) - real*4 red3(NSMAX) logical ccfok(NSMAX) logical done(NSMAX) integer*1 i1SoftSymbols(207) @@ -21,6 +20,11 @@ subroutine decoder(ss,c0,nstandalone) common/tracer/limtrace,lu save +! write(40) nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfb,ntol, & +! kin,nzhsym,nsave,nagain,ndepth,nrxlog,nfsample,datetime, & +! ss(1:184,1:1365),c0(1:npts8) +! call flush(40) + call system_clock(iclock0,iclock_rate,iclock_max) !### nfreqs0=0 nfreqs1=0 @@ -68,7 +72,7 @@ subroutine decoder(ss,c0,nstandalone) lag1=-(2.5/tstep + 0.9999) lag2=5.0/tstep + 0.9999 call timer('sync9 ',0) - call sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,red2,red3,ipk) + call sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,red2,ipk) call timer('sync9 ',1) nsps8=nsps/8 @@ -145,8 +149,8 @@ subroutine decoder(ss,c0,nstandalone) ndrift=nint(drift/df3) ! write(38,3002) nutc,nqd,nsnr,i,freq,ccfred(i),red2(i), & -! red3(i),schk,nlim,msg -!3002 format(i4.4,i2,i4,i5,f7.1,f5.1,f6.1,2f5.1,i8,1x,a22) +! schk,nlim,msg +!3002 format(i4.4,i2,i4,i5,f7.1,f5.1,f6.1,f5.1,i8,1x,a22) if(msg.ne.' ') then if(nqd.eq.0) ndecodes0=ndecodes0+1 @@ -167,7 +171,7 @@ subroutine decoder(ss,c0,nstandalone) call flush(6) endif else -! write(38,3002) nutc,nqd,-99,i,freq,ccfred(i),red2(i),red3(i), & +! write(38,3002) nutc,nqd,-99,i,freq,ccfred(i),red2(i), & ! schk,0 endif endif diff --git a/lib/sync9.f90 b/lib/sync9.f90 index 580cb472e..8890e3143 100644 --- a/lib/sync9.f90 +++ b/lib/sync9.f90 @@ -1,4 +1,4 @@ -subroutine sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,red2,red3,ipkbest) +subroutine sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,red2,ipkbest) parameter (NSMAX=22000) !Max length of saved spectra real ss(184,NSMAX) @@ -9,7 +9,6 @@ subroutine sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,red2,red3,ipkbest) real smo(-5:25) real sq(NSMAX) real red2(NSMAX) - real red3(NSMAX) include 'jt9sync.f90' ipk=0 @@ -33,7 +32,6 @@ subroutine sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,red2,red3,ipkbest) rms=sqrt(sq0/(nzhsym-1)) smax=0. - smax2=0. do lag=lag1,lag2 !DT = 2.5 to 5.0 s sum1=0. sq2=sq0 @@ -51,10 +49,8 @@ subroutine sync9(ss,nzhsym,lag1,lag2,ia,ib,ccfred,red2,red3,ipkbest) ipk=i endif rms=sqrt(sq2/(nsum-1)) - if(sum1/rms.gt.smax2) smax2=sum1/rms enddo ccfred(i)=smax !Best at this freq, over all lags - red3(i)=0.1*smax2 - 1.0 if(smax.gt.sbest) then sbest=smax ipkbest=ipk diff --git a/mainwindow.cpp b/mainwindow.cpp index 5346b6498..b965dd49b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"