From 141f0ceefae60f62457ab93e1cab4f67d7abc6ef Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 14 Jul 2017 18:19:48 +0000 Subject: [PATCH] Fix nutc in jt9; alternative sync value for late-start FT8 signals. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7881 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/fsk4hf/sync8.f90 | 30 +++++++++++++++++++++--------- lib/ft8_decode.f90 | 6 +++--- lib/jt9.f90 | 6 +++--- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/lib/fsk4hf/sync8.f90 b/lib/fsk4hf/sync8.f90 index 278d5a780..d52765871 100644 --- a/lib/fsk4hf/sync8.f90 +++ b/lib/fsk4hf/sync8.f90 @@ -46,23 +46,35 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand) nfos=NFFT1/NSPS ! # frequency bin oversampling factor do i=ia,ib do j=-JZ,JZ - t=0. - t0=0. + ta=0. + tb=0. + tc=0. + t0a=0. + t0b=0. + t0c=0. do n=0,6 k=j+nssy*n if(k.ge.1.and.k.le.NHSYM) then - t=t + s(i+nfos*icos7(n),k) - t0=t0 + sum(s(i:i+nfos*6:nfos,k)) + ta=ta + s(i+nfos*icos7(n),k) + t0a=t0a + sum(s(i:i+nfos*6:nfos,k)) endif - t=t + s(i+nfos*icos7(n),k+nssy*36) - t0=t0 + sum(s(i:i+nfos*6:nfos,k+nssy*36)) + tb=tb + s(i+nfos*icos7(n),k+nssy*36) + t0b=t0b + sum(s(i:i+nfos*6:nfos,k+nssy*36)) if(k+nssy*72.le.NHSYM) then - t=t + s(i+nfos*icos7(n),k+nssy*72) - t0=t0 + sum(s(i:i+nfos*6:nfos,k+nssy*72)) + tc=tc + s(i+nfos*icos7(n),k+nssy*72) + t0c=t0c + sum(s(i:i+nfos*6:nfos,k+nssy*72)) endif enddo + t=ta+tb+tc + t0=t0a+t0b+t0c t0=(t0-t)/6.0 - sync2d(i,j)=t/t0 + sync_abc=t/t0 + + t=tb+tc + t0=t0b+t0c + t0=(t0-t)/6.0 + sync_bc=t/t0 + sync2d(i,j)=max(sync_abc,sync_bc) enddo enddo diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 50008d9de..db04f652e 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -83,9 +83,9 @@ contains call timer('ft8b ',1) if(nbadcrc.eq.0 .and. associated(this%callback)) then call this%callback(sync,nsnr,xdt,f1,message) - write(81,3081) ncand,icand,iera,nharderrors,ipass, & - sync,f1,xdt,dmin,xsnr,message -3081 format(2i5,i2,i3,i2,2f7.1,3f7.2,1x,a22) +! write(81,3081) ncand,icand,iera,nharderrors,ipass, & +! db(sync),f1,xdt,dmin,xsnr,message +!3081 format(2i5,i2,i3,i2,f7.2,f7.1,3f7.2,1x,a22) endif enddo ! h=default_header(12000,NMAX) diff --git a/lib/jt9.f90 b/lib/jt9.f90 index 954ed2510..b75a2ab27 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -187,7 +187,7 @@ program jt9 if(infile(i1-5:i1-5).eq.'_') then read(infile(i1-4:i1-1),*,err=1) nutc else - read(infile(i1-6:i1-3),*,err=1) nutc + read(infile(i1-6:i1-1),*,err=1) nutc endif go to 2 1 nutc=0 @@ -238,8 +238,8 @@ program jt9 ingain=0 call timer('symspec ',0) nminw=1 - call symspec(shared_data,k,ntrperiod,nsps,ingain,nminw,pxdb,s,df3, & - ihsym,npts8,pxdbmax) + call symspec(shared_data,k,ntrperiod,nsps,ingain,nminw,pxdb, & + s,df3,ihsym,npts8,pxdbmax) call timer('symspec ',1) endif nhsym0=nhsym