diff --git a/lib/ft8/subtractft8.f90 b/lib/ft8/subtractft8.f90 index 7c3b59082..40657e7e7 100644 --- a/lib/ft8/subtractft8.f90 +++ b/lib/ft8/subtractft8.f90 @@ -58,6 +58,8 @@ subroutine subtractft8(dd0,itone,f0,dt,lrefinedt) sq0=sqf(0) !Do the subtraction with idt=0 endif dd0=dd !Return dd0 with this signal subtracted +! write(44,3044) nint(f0),dt-0.5,1.e-8*sum(dd*dd) +!3044 format(i4,f7.2,f10.6) return contains diff --git a/lib/ft8_a7.f90 b/lib/ft8_a7.f90 index 96ffe13e6..7a73d7655 100644 --- a/lib/ft8_a7.f90 +++ b/lib/ft8_a7.f90 @@ -10,6 +10,7 @@ module ft8_a7 real f0(MAXDEC,0:1,0:1) !f0(i,j,k) character*37 msg0(MAXDEC,0:1,0:1) !msg0(i,j,k) + integer itone_a7(79) integer jseq !even=0, odd=1 integer ndec(0:1,0:1) !ndec(j,k) data ndec/4*0/,jseq/0/ @@ -186,6 +187,7 @@ subroutine ft8_dec7(cd,xdt0,f0,msg0,xdt,xsnr,msgbest,snr7,snr7b) lagbest=lagmax msgbest=msg imsgbest=imsg + itone_a7=itone endif enddo ! imsg diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index b9e01be4c..f9a4320ad 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -87,8 +87,8 @@ contains ndec(jseq,0)=iz ndec(jseq,1)=0 nutc0=nutc -! print*,'BBB',jseq,ndec(0,0),ndec(0,1) endif +! write(44,*) 'AAA',nutc,nzhsym if(ndepth.eq.1 .and. nzhsym.lt.50) then ndec_early=0 @@ -234,6 +234,7 @@ contains if(nzhsym.eq.50 .and. ndec(jseq,0).ge.1) then call timer('ft8_dec7',0) newdat=.true. + write(44,*) 'BBB',nutc do i=1,ndec(jseq,0) if(f0(i,jseq,0).eq.-99.0) exit if(f0(i,jseq,0).eq.-98.0) cycle @@ -242,21 +243,22 @@ contains call ft8_dec7(cd0,dt0(i,jseq,0),f0(i,jseq,0),msg0(i,jseq,0), & xdt,xsnr,msg37,snr7,snr7b) ddt=xdt-dt0(i,jseq,0) - write(41,3041) nutc,snr7,snr7b,xdt,ddt,nint(f0(i,jseq,0)),trim(msg37) -3041 format(i6.6,4f7.2,i5,2x,a) +! write(41,3041) nutc,snr7,snr7b,xdt,ddt,nint(f0(i,jseq,0)),trim(msg37) +!3041 format(i6.6,4f7.2,i5,2x,a) if(snr7.lt.6.0 .or. snr7b.lt.1.8) cycle - write(42,3041) nutc,snr7,snr7b,xdt,ddt,nint(f0(i,jseq,0)),trim(msg37) - flush(41) - flush(42) - if(xsnr.gt.-99.0 .and. associated(this%callback)) then +! write(42,3041) nutc,snr7,snr7b,xdt,ddt,nint(f0(i,jseq,0)),trim(msg37) +! flush(41) +! flush(42) + if(associated(this%callback)) then nsnr=xsnr f1=f0(i,jseq,0) iaptype=7 qual=1.0 call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual) ! Call subtract here? + call subtractft8(dd,itone_a7,f1,xdt+0.5,.false.) !### ??? ### endif - newdat=.false. +! newdat=.false. enddo call timer('ft8_dec7',1) endif