diff --git a/lib/ft8/ft8b_2.f90 b/lib/ft8/ft8b_2.f90 index 5db727168..082706021 100644 --- a/lib/ft8/ft8b_2.f90 +++ b/lib/ft8/ft8b_2.f90 @@ -335,14 +335,14 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & ios=mod(itone(i)+4,7) xnoi=xnoi+s8(ios,i)**2 enddo - xsnr=0.001 if(xnoi.gt.0 .and. xnoi.lt.xsig) xsnr=xsig/xnoi-1.0 xsnr=10.0*log10(xsnr)-27.0 -! need to reconcile signal normalization between this routine and the old ft8b_1 so -! that SNRs come out the same. - xsnr2=db(xsig/xbase - 1.0) - 32.0 -! if(.not.nagain) xsnr=xsnr2 + xbase=10**(xbase/10.0) +! factor=xnoi/xbase + factor=3.6e6 + xsnr2=10*log10(xsig/xbase/factor-1.0)-27.0 + if(.not.nagain) xsnr=xsnr2 if(xsnr .lt. -24.0) xsnr=-24.0 return diff --git a/lib/ft8/sync8.f90 b/lib/ft8/sync8.f90 index f7510758f..c4d3d3efa 100644 --- a/lib/ft8/sync8.f90 +++ b/lib/ft8/sync8.f90 @@ -39,11 +39,6 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,ldecode77,maxcand,s,candidate,ncand,sb savg=savg + s(1:NH1,j) !Average spectrum enddo call baseline(savg,nfa,nfb,sbase) -! savg=savg/NHSYM -! do i=1,NH1 -! write(51,3051) i*df,savg(i),db(savg(i)) -!3051 format(f10.3,e12.3,f12.3) -! enddo ia=max(1,nint(nfa/df)) ib=nint(nfb/df)