diff --git a/lib/ft8/sync8.f90 b/lib/ft8/sync8.f90 index d498e6f4c..f93afe75a 100644 --- a/lib/ft8/sync8.f90 +++ b/lib/ft8/sync8.f90 @@ -73,10 +73,6 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,nzhsym,candidate, & t0c=t0c + sum(s(i:i+nfos*6:nfos,m+nssy*72)) endif enddo - t=ta+tb - t0=t0a+t0b - t0=(t0-t)/6.0 - sync_ab=t/t0 t=ta+tb+tc t0=t0a+t0b+t0c t0=(t0-t)/6.0 @@ -85,14 +81,7 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,nzhsym,candidate, & t0=t0b+t0c t0=(t0-t)/6.0 sync_bc=t/t0 - if(j.le.-12) then - sync2d(i,j)=sync_bc - elseif(j.gt.-12 .and. j.lt. 49) then - if(nzhsym.eq.41) sync2d(i,j)=sync_ab - if(nzhsym.eq.50) sync2d(i,j)=max(sync_abc,sync_bc) - elseif(j.ge.49) then - sync2d(i,j)=sync_ab - endif + sync2d(i,j)=max(sync_abc,sync_bc) enddo enddo diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 911ecb31e..4bd637e95 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -44,7 +44,7 @@ contains class(ft8_decoder), intent(inout) :: this procedure(ft8_decode_callback) :: callback - parameter (MAXCAND=500,MAX_EARLY=100) + parameter (MAXCAND=600,MAX_EARLY=100) real*8 tsec,tseq real s(NH1,NHSYM) real sbase(NH1) @@ -109,6 +109,7 @@ contains dd=iwave dd1=dd endif + if(nzhsym.eq.41) then ndecodes=0 allmessages=' ' @@ -116,10 +117,12 @@ contains else ndecodes=ndec_early endif + if(nzhsym.eq.47 .and. ndec_early.eq.0) then dd1=dd go to 800 endif + if(nzhsym.eq.47 .and. ndec_early.ge.1) then lsubtracted=.false. lrefinedt=.true. @@ -142,6 +145,7 @@ contains dd1=dd go to 900 endif + if(nzhsym.eq.50 .and. ndec_early.ge.1 .and. .not.nagain) then n=47*3456 dd(1:n)=dd1(1:n) @@ -153,6 +157,7 @@ contains enddo call timer('sub_ft8c',1) endif + ifa=nfa ifb=nfb if(nzhsym.eq.50 .and. nagain) then @@ -171,7 +176,6 @@ contains newdat=.true. syncmin=1.3 if(ndepth.le.2) syncmin=1.6 -! if(nzhsym.eq.41.or.ipass.eq.1) syncmin=2.0 if(nzhsym.eq.41) syncmin=2.0 if(ipass.eq.1) then lsubtract=.true. @@ -225,10 +229,6 @@ contains if(emedelay.ne.0) xdt=xdt+2.0 call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual) call ft8_a7_save(nutc,xdt,f1,msg37) !Enter decode in table -! ii=ndec(jseq,1) -! write(41,3041) jseq,ii,nint(f0(ii,jseq,0)),msg0(ii,jseq,0)(1:22),& -! nint(f0(ii,jseq,1)),msg0(ii,jseq,1)(1:22) -!3041 format(3i5,2x,a22,i5,2x,a22) endif endif call timestamp(tsec,tseq,ctime)