From f3d6de87d80da4f01140759282f7c91c1735dd5a Mon Sep 17 00:00:00 2001
From: Steven Franke <s.j.franke@icloud.com>
Date: Wed, 13 Jul 2016 20:29:18 +0000
Subject: [PATCH] Quantize SNR to 2dB steps.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6911 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/detectmsk144.f90 |  4 +++-
 lib/detectmsk32.f90  | 12 +++++++-----
 lib/genmsk32.f90     |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/detectmsk144.f90 b/lib/detectmsk144.f90
index 062085df8..d7e51af54 100644
--- a/lib/detectmsk144.f90
+++ b/lib/detectmsk144.f90
@@ -171,7 +171,9 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
     t0=times(ip)
     cdat=cbig(imid-NPTS/2+1:imid+NPTS/2)
     ferr=ferrs(ip)
-    nsnr=snrs(ip)
+    nsnr=2*nint(snrs(ip)/2.0)
+    if( nsnr .lt. -4 ) nsnr=-4
+    if( nsnr .gt. 24 ) nsnr=24
 
 ! remove coarse freq error - should now be within a few Hz
     call tweak1(cdat,NPTS,-(1500+ferr),cdat)
diff --git a/lib/detectmsk32.f90 b/lib/detectmsk32.f90
index 18774504e..40ddcac89 100644
--- a/lib/detectmsk32.f90
+++ b/lib/detectmsk32.f90
@@ -48,10 +48,10 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol)
   data first/.true./
   data s8/0,1,1,1,0,0,1,0/
   data s8r/1,0,1,1,0,0,0,1/
-  data rpt /'-04 ','-03 ','-02 ','-01 ','+00 ','+01 ','+02 ','+03 ','+04 ', &
-            '+05 ','+06 ','+07 ','+08 ','+09 ','+10 ', &
-            'R-04','R-03','R-02','R-01','R+00','R+01','R+02','R+03','R+04', &
-            'R+05','R+06','R+07','R+08','R+09','R10', &
+  data rpt /'-04 ','-02 ','+00 ','+02 ','+04 ','+06 ','+08 ','+10 ','+12 ', &
+            '+14 ','+16 ','+18 ','+20 ','+22 ','+24 ', &
+            'R-04','R-02','R+00','R+02','R+04','R+06','R+08','R+10','R+12', &
+            'R+14','R+16','R+18','R+20','R+22','R+24', &
             'RRR ','73  '/
   save df,first,cb,cbr,fs,pi,twopi,dt,s8,rcw,pp,nmatchedfilter,ig24
 
@@ -208,7 +208,9 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc,ntol)
     t0=times(ip)
     cdat=cbig(imid-NPTS/2+1:imid+NPTS/2)
     ferr=ferrs(ip)
-    nsnr=nint(snrs(ip))
+    nsnr=2*nint(snrs(ip)/2.0)
+    if( nsnr .lt. -4 ) nsnr=-4
+    if( nsnr .gt. 24 ) nsnr=24
 
 ! remove coarse freq error - should now be within a few Hz
     call tweak1(cdat,NPTS,-(1500+ferr),cdat)
diff --git a/lib/genmsk32.f90 b/lib/genmsk32.f90
index 53fb95035..405ff0b1e 100644
--- a/lib/genmsk32.f90
+++ b/lib/genmsk32.f90
@@ -9,10 +9,10 @@ subroutine genmsk32(msg,msgsent,ichk,itone,itype)
   integer*1 codeword(24),bitseq(32)
   integer*1 s8r(8)
   data s8r/1,0,1,1,0,0,0,1/
-  data rpt /'-04 ','-03 ','-02 ','-01 ','+00 ','+01 ','+02 ','+03 ','+04 ', &
-            '+05 ','+06 ','+07 ','+08 ','+09 ','+10 ', &
-            'R-04','R-03','R-02','R-01','R+00','R+01','R+02','R+03','R+04', &
-            'R+05','R+06','R+07','R+08','R+09','R+10', &
+  data rpt /'-04 ','-02 ','+00 ','+02 ','+04 ','+06 ','+08 ','+10 ','+12 ', &
+            '+14 ','+16 ','+18 ','+20 ','+22 ','+24 ', &
+            'R-04','R-02','R+00','R+02','R+04','R+06','R+08','R+10','R+12', &
+            'R+14','R+16','R+18','R+20','R+22','R+24', &
             'RRR ','73  '/
 
   data first/.true./