From 2e71491b8a5187b8eb1cc3d6934584a4be995827 Mon Sep 17 00:00:00 2001
From: Steven Franke <s.j.franke@icloud.com>
Date: Mon, 1 Jan 2018 22:11:36 +0000
Subject: [PATCH] Attempt to improve calibration of JT65 V/U/M SNR estimates.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8389 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/decode65a.f90   | 1 -
 lib/extract.f90     | 4 ++--
 lib/jt65_decode.f90 | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/decode65a.f90 b/lib/decode65a.f90
index 778cf930e..8d6187d6c 100644
--- a/lib/decode65a.f90
+++ b/lib/decode65a.f90
@@ -123,7 +123,6 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials,     &
         endif
         s2(i,1:126)=s1(jj,1:126)
      enddo
-
      nadd=ismo  !### ??? ###
      call decode65b(s2,nflip,nadd,mode65,ntrials,naggressive,ndepth,        &
           mycall,hiscall,hisgrid,nQSOProgress,ljt65apon,nexp_decode,        &
diff --git a/lib/extract.f90 b/lib/extract.f90
index cfd2c45d6..0ec85158b 100644
--- a/lib/extract.f90
+++ b/lib/extract.f90
@@ -48,13 +48,13 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip,     &
 !   5        MyCall DxCall 73
 
      apsymbols=-1
-     nappasses=(/2,2,2,3,3,3/)
+     nappasses=(/2,2,2,3,3,4/)
      naptypes(0,1:4)=(/1,2,0,0/)
      naptypes(1,1:4)=(/2,3,0,0/)
      naptypes(2,1:4)=(/2,3,0,0/)
      naptypes(3,1:4)=(/3,4,5,0/)
      naptypes(4,1:4)=(/3,4,5,0/)
-     naptypes(5,1:4)=(/3,1,2,0/)  
+     naptypes(5,1:4)=(/3,4,5,2/)  
      first=.false.
   endif
 
diff --git a/lib/jt65_decode.f90 b/lib/jt65_decode.f90
index 2ae90f9df..4a899b8bc 100644
--- a/lib/jt65_decode.f90
+++ b/lib/jt65_decode.f90
@@ -256,7 +256,9 @@ contains
           nfreq=nint(freq+a(1))
           ndrift=nint(2.0*a(2))
           if(bVHF) then
-             s2db=sync1 - 30.0 + db(width/3.3)       !### VHF/UHF/microwave
+            xtmp=10**((sync1+16.0)/10.0) ! sync comes to us in dB
+            s2db=1.1*db(xtmp)+1.4*(dB(width)-4.3)-52.0 
+!             s2db=sync1 - 30.0 + db(width/3.3)       !### VHF/UHF/microwave
              if(nspecial.gt.0) s2db=sync2
           else
              s2db=10.0*log10(sync2) - 35             !### Empirical (HF) 
@@ -299,7 +301,6 @@ contains
           n=naggressive
           rtt=0.001*nrtt1000
           if(nft.lt.2 .and. minsync.ge.0 .and. nspecial.eq.0) then
-!write(*,*) dtx,freq,nft,minsync,nhard_min,ntotal_min,rtt
              if(nhard_min.gt.50) cycle
              if(nhard_min.gt.h0(n)) cycle
              if(ntotal_min.gt.d0(n)) cycle
@@ -323,7 +324,6 @@ contains
                    exit
                 endif
              enddo
-!write(*,*) 'ndupe ',ndupe,sync1,minsync
              if(ndupe.ne.1 .and. sync1.ge.float(minsync)) then 
                 if(ipass.eq.1) n65a=n65a + 1
                 if(ipass.eq.2) n65b=n65b + 1