Working on decoding issues...

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2723 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

lib/decoder.f90

@@ -1,7 +1,6 @@
 subroutine decoder(ntrSeconds,ndepth,nRxLog,c00)
 
-! Decoder for JT9.  
-! NB: For unknown reason, ***MUST*** be compiled by g95 with -O0 !!!
+! Decoder for JT9.
 
   parameter (NMAX=1800*12000)        !Total sample intervals per 30 minutes
   parameter (NDMAX=1800*1500)        !Sample intervals at 1500 Hz rate
@@ -81,20 +80,18 @@ subroutine decoder(ntrSeconds,ndepth,nRxLog,c00)
   do i=ia,ib
      f=(i-1)*df3
      if((i.eq.ipk .or. ccfred(i).ge.3.0) .and. f.gt.fgood+10.0*df8) then
-        call spec9(c0,npts8,nsps,f,fpk,xdt,snrdb,i1SoftSymbols)
+        call spec9(c0,npts8,nsps,f,fpk,xdt,snr,i1SoftSymbols)
         call decode9(i1SoftSymbols,limit,nlim,msg)
-!        snr=10.0*log10(ccfred(i)) - 10.0*log10(2500.0/df3) + 2.0
-        snr=snrdb
         sync=ccfred(i) - 2.0
         if(sync.lt.0.0) sync=0.0
         nsync=sync
         if(nsync.gt.10) nsync=10
         nsnr=nint(snr)
-        width=0.0
+        drift=0.0
 
         if(ccfred(i).gt.sbest .and. fgood.eq.0.0) then
            sbest=ccfred(i)
-           write(line,fmt) nutc,nsync,nsnr,xdt,1000.0+fpk,width
+           write(line,fmt) nutc,nsync,nsnr,xdt,1000.0+fpk,drift
            if(nsync.gt.0) nsynced=1
         endif
 

lib/symspec.f90

@@ -58,7 +58,6 @@ subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red,    &
   endif
 
   if(k.lt.k0) then
-!     ja=-3*jstep
      ja=0
      ssum=0.
      ihsym=0
@@ -110,9 +109,9 @@ subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red,    &
   if(pxdb.gt.60.0) pxdb=60.0
 
   do i=0,nfft3-1                      !Copy data into cx
-     cx(i)=0.
      j=ja+i-(nfft3-1)
-     if(j.ge.1) cx(i)=c0(j)
+     cx(i)=0.
+     if(j.ge.1 .and. j.le.NDMAX) cx(i)=c0(j)
   enddo
 
   if(ihsym.lt.184) ihsym=ihsym+1

mainwindow.cpp

@@ -1,4 +1,4 @@
-//-------------------------------------------------------------- MainWindow
+//--------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"