From c4b81c55cf575bfe054e431eaf0b595d838cbf40 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 6 Oct 2012 15:38:06 +0000 Subject: [PATCH] Playing with decode and simulator params. Calibration is not secure! git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2653 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decode9.f90 | 3 ++- lib/jt9.f90 | 2 +- lib/jt9sim.f90 | 3 ++- mainwindow.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/decode9.f90 b/lib/decode9.f90 index fa52545b5..05f53d081 100644 --- a/lib/decode9.f90 +++ b/lib/decode9.f90 @@ -20,7 +20,8 @@ subroutine decode9(i1SoftSymbols,msg) if(first) then ! Get the metric table - bias=0.37 !To be optimized, in decoder program +! bias=0.37 !To be optimized, in decoder program + bias=0.0 !Seems better, in jt9.exe ??? scale=10 ! ... ditto ... open(19,file='met8.21',status='old') do i=0,255 diff --git a/lib/jt9.f90 b/lib/jt9.f90 index 2be912a6f..c75fb3202 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -107,7 +107,7 @@ program jt9 call sync9(ss,tstep,f0a,df3,fpk) !Find sig, get rough freq call spec9(c0,npts8,nsps,f0a,fpk,xdt,i1SoftSymbols) call decode9(i1SoftSymbols,msg) - write(*,1010) nutc,xdt,fpk,msg + write(*,1010) nutc,xdt,1000.0+fpk,msg 1010 format(i4.4,f6.1,f7.1,2x,a22) enddo diff --git a/lib/jt9sim.f90 b/lib/jt9sim.f90 index ee78cadbe..aafab0935 100644 --- a/lib/jt9sim.f90 +++ b/lib/jt9sim.f90 @@ -108,7 +108,8 @@ program jt9sim f=f0 if(nsigs.gt.1) f=f0 - 0.5d0*fspan + fspan*(isig-1.d0)/(nsigs-1.d0) snrdbx=snrdb - sig=sqrt(2500.0/6000.0) * 10.0**(0.05*snrdbx) +! sig=sqrt(2500.0/6000.0) * 10.0**(0.05*snrdbx) + sig=10.0**(0.05*snrdbx) write(*,1020) ifile,isig,f,snrdbx,msgsent 1020 format(i3,i4,f10.3,f7.1,2x,a22) diff --git a/mainwindow.cpp b/mainwindow.cpp index 5dc3f045e..9b139331c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//---------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"