diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 0e3b4f47a..ae878679e 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -96,7 +96,7 @@ contains call timer('sync_q65',1) irc=-1 - if(snr1.lt.2.5) go to 100 + if(snr1.lt.2.8) go to 100 jpk0=(xdt+1.0)*6000 !### Is this OK? if(ntrperiod.le.30) jpk0=(xdt+0.5)*6000 !### if(jpk0.lt.0) jpk0=0 @@ -128,7 +128,7 @@ contains endif call timer('q65loops',0) call q65_loops(c00,npts/2,nsps/2,nmode,mode65,nsubmode,nFadingModel, & - ndepth,jpk0,xdt,f0,width,ipass,apmask,apsymbols,snr2,irc,dat4) + ndepth,jpk0,xdt,f0,width,ipass,apmask,apsymbols,snr1,snr2,irc,dat4) call timer('q65loops',1) snr2=snr2 + db(6912.0/nsps) if(irc.ge.0) exit diff --git a/lib/qra/q65/q65_loops.f90 b/lib/qra/q65/q65_loops.f90 index d36ca395f..01fc56054 100644 --- a/lib/qra/q65/q65_loops.f90 +++ b/lib/qra/q65/q65_loops.f90 @@ -1,5 +1,5 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, & - ndepth,jpk0,xdt,f0,width,ipass,APmask,APsymbols,snr2,irc,dat4) + ndepth,jpk0,xdt,f0,width,ipass,APmask,APsymbols,snr1,snr2,irc,dat4) use packjt77 use timer_module, only: timer @@ -105,14 +105,13 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, & snr2=esnodb - db(2500.0/baud) if(iavg.eq.0) navg=0 !### For tests only: - open(53,file='fort.53',status='unknown',position='append') + open(53,file='fort.53',status='unknown') write(c77,1100) dat4 1100 format(12b6.6,b5.5) call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent write(53,3053) ndf,ndt,nbw,b90,xdt,f0,snr2,ndist,irc,ipass,navg, & - trim(decoded) -3053 format(3i5,f7.1,f7.2,2f7.1,4i4,2x,a) - close(53) + snr1,trim(decoded) +3053 format(3i4,f6.1,f6.2,f7.1,f6.1,4i4,f7.2,1x,a) !### nsave=0 s3avg=0.