w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-13 12:02:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove diagnostic writes. Include subtraction of a7 decodes.

Browse Source
This commit is contained in:
Joe Taylor 2021-10-29 16:22:48 -04:00
parent c30b91cb69
commit 93ade73af7
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ft8/subtractft8.f90
View File

@ -58,6 +58,8 @@ subroutine subtractft8(dd0,itone,f0,dt,lrefinedt)
sq0=sqf(0) !Do the subtraction with idt=0 sq0=sqf(0) !Do the subtraction with idt=0
endif endif
dd0=dd !Return dd0 with this signal subtracted 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 return
contains contains

2
lib/ft8_a7.f90
View File

@ -10,6 +10,7 @@ module ft8_a7
real f0(MAXDEC,0:1,0:1) !f0(i,j,k) real f0(MAXDEC,0:1,0:1) !f0(i,j,k)
character*37 msg0(MAXDEC,0:1,0:1) !msg0(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 jseq !even=0, odd=1
integer ndec(0:1,0:1) !ndec(j,k) integer ndec(0:1,0:1) !ndec(j,k)
data ndec/4*0/,jseq/0/ data ndec/4*0/,jseq/0/
@ -186,6 +187,7 @@ subroutine ft8_dec7(cd,xdt0,f0,msg0,xdt,xsnr,msgbest,snr7,snr7b)
lagbest=lagmax lagbest=lagmax
msgbest=msg msgbest=msg
imsgbest=imsg imsgbest=imsg
itone_a7=itone
endif endif
enddo ! imsg enddo ! imsg

18
lib/ft8_decode.f90
View File

@ -87,8 +87,8 @@ contains
ndec(jseq,0)=iz ndec(jseq,0)=iz
ndec(jseq,1)=0 ndec(jseq,1)=0
nutc0=nutc nutc0=nutc
! print*,'BBB',jseq,ndec(0,0),ndec(0,1)
endif endif
! write(44,*) 'AAA',nutc,nzhsym
if(ndepth.eq.1 .and. nzhsym.lt.50) then if(ndepth.eq.1 .and. nzhsym.lt.50) then
ndec_early=0 ndec_early=0
@ -234,6 +234,7 @@ contains
if(nzhsym.eq.50 .and. ndec(jseq,0).ge.1) then if(nzhsym.eq.50 .and. ndec(jseq,0).ge.1) then
call timer('ft8_dec7',0) call timer('ft8_dec7',0)
newdat=.true. newdat=.true.
write(44,*) 'BBB',nutc
do i=1,ndec(jseq,0) do i=1,ndec(jseq,0)
if(f0(i,jseq,0).eq.-99.0) exit if(f0(i,jseq,0).eq.-99.0) exit
if(f0(i,jseq,0).eq.-98.0) cycle 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), & call ft8_dec7(cd0,dt0(i,jseq,0),f0(i,jseq,0),msg0(i,jseq,0), &
xdt,xsnr,msg37,snr7,snr7b) xdt,xsnr,msg37,snr7,snr7b)
ddt=xdt-dt0(i,jseq,0) ddt=xdt-dt0(i,jseq,0)
write(41,3041) nutc,snr7,snr7b,xdt,ddt,nint(f0(i,jseq,0)),trim(msg37) ! write(41,3041) nutc,snr7,snr7b,xdt,ddt,nint(f0(i,jseq,0)),trim(msg37)
3041 format(i6.6,4f7.2,i5,2x,a) !3041 format(i6.6,4f7.2,i5,2x,a)
if(snr7.lt.6.0 .or. snr7b.lt.1.8) cycle 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) ! write(42,3041) nutc,snr7,snr7b,xdt,ddt,nint(f0(i,jseq,0)),trim(msg37)
flush(41) ! flush(41)
flush(42) ! flush(42)
if(xsnr.gt.-99.0 .and. associated(this%callback)) then if(associated(this%callback)) then
nsnr=xsnr nsnr=xsnr
f1=f0(i,jseq,0) f1=f0(i,jseq,0)
iaptype=7 iaptype=7
qual=1.0 qual=1.0
call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual) call this%callback(sync,nsnr,xdt,f1,msg37,iaptype,qual)
! Call subtract here? ! Call subtract here?
call subtractft8(dd,itone_a7,f1,xdt+0.5,.false.) !### ??? ###
endif endif
newdat=.false. ! newdat=.false.
enddo enddo
call timer('ft8_dec7',1) call timer('ft8_dec7',1)
endif endif