Code cleanup and test ofFT8 decodes with erasures. Do not use on the air.

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

lib/decoder.f90

@@ -390,7 +390,7 @@ contains
     end select
   end subroutine jt9_decoded
 
-  subroutine ft8_decoded (this,sync,snr,dt,freq,nbadcrc,decoded)
+  subroutine ft8_decoded (this,sync,snr,dt,freq,decoded)
     use ft8_decode
     implicit none
 
@@ -399,17 +399,14 @@ contains
     integer, intent(in) :: snr
     real, intent(in) :: dt
     real, intent(in) :: freq
-    integer, intent(in) :: nbadcrc
     character(len=22), intent(in) :: decoded
 
-    if(nbadcrc.eq.0) then
     write(*,1000) params%nutc,snr,dt,nint(freq),decoded
 1000 format(i6.6,i4,f5.1,i5,' ~ ',1x,a22)
     write(13,1002) params%nutc,nint(sync),snr,dt,freq,0,decoded
 1002 format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a22,' FT8')
     call flush(6)
     call flush(13)
-    endif
     
     select type(this)
     type is (counting_ft8_decoder)

lib/fsk4hf/ft8b.f90

@@ -1,5 +1,5 @@
-subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,icand,sync0,f1,xdt,apsym,nharderrors,   &
+subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,icand,sync0,f1,xdt,   &
-     dmin,nbadcrc,iap,ipass,message,xsnr)
+     apsym,nharderrors,dmin,nbadcrc,iap,ipass,iera,message,xsnr)
 
   use timer_module, only: timer
   include 'ft8_params.f90'
@@ -9,7 +9,7 @@ subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,icand,sync0,f1,xdt,apsym,nhard
   real a(5)
   real s1(0:7,ND),s2(0:7,NN)
   real ps(0:7)
-  real rxdata(3*ND),llr(3*ND),llrap(3*ND)           !Soft symbols
+  real rxdata(3*ND),llr(3*ND),llr0(3*ND),llrap(3*ND)           !Soft symbols
   real dd0(15*12000)
   integer*1 decoded(KK),apmask(3*ND),cw(3*ND)
   integer*1 msgbits(KK)
@@ -109,9 +109,20 @@ subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,icand,sync0,f1,xdt,apsym,nhard
   rxdata=rxdata/rxsig
   ss=0.84
   llr=2.0*rxdata/(ss*ss)
+  llr0=llr
   apmag=4.0
-!  do iap=0,1
+!  nera=1
+  nera=3
+
+!  do iap=0,3
   do iap=0,0                            !### Temporary ###
+     do iera=1,nera
+        llr=llr0
+        nblank=0
+        if(nera.eq.3 .and. iera.eq.1) nblank=48
+        if(nera.eq.3 .and. iera.eq.2) nblank=24
+        if(nera.eq.3 .and. iera.eq.3) nblank=0
+        if(nblank.gt.0) llr(1:nblank)=0.
         if(iap.eq.0) then
            apmask=0
            apmask(160:162)=1
@@ -152,7 +163,8 @@ subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,icand,sync0,f1,xdt,apsym,nhard
         endif
         cw=0
         call timer('bpd174  ',0)
-    call bpdecode174(llrap,apmask,max_iterations,decoded,cw,nharderrors,niterations)
+        call bpdecode174(llrap,apmask,max_iterations,decoded,cw,nharderrors,  &
+             niterations)
         call timer('bpd174  ',1)
         dmin=0.0
         if(ndepth.eq.3 .and. abs(nfqso-f1).lt.10.0 .and. nharderrors.lt.0) then
@@ -187,10 +199,10 @@ subroutine ft8b(dd0,newdat,nfqso,ndepth,lsubtract,icand,sync0,f1,xdt,apsym,nhard
            if(xnoi.gt.0 .and. xnoi.lt.xsig) xsnr=xsig/xnoi-1.0
            xsnr=10.0*log10(xsnr)-27.0
            if(xsnr .lt. -24.0) xsnr=-24.0
-!     write(50,3050) icand,sync0,f1,xdt,xsnr,nharderrors,niterations,dmin,iap,ipass,message
+           exit
-!3050 format(i3,4f10.3,i5,i5,f10.3,i4,i4,2x,a22)
-     return
         endif
      enddo
+  enddo
+ 
   return
 end subroutine ft8b

lib/ft8_decode.f90

@@ -7,7 +7,7 @@ module ft8_decode
   end type ft8_decoder
 
   abstract interface
-     subroutine ft8_decode_callback (this,sync,snr,dt,freq,nbadcrc,decoded)
+     subroutine ft8_decode_callback (this,sync,snr,dt,freq,decoded)
        import ft8_decoder
        implicit none
        class(ft8_decoder), intent(inout) :: this
@@ -15,7 +15,6 @@ module ft8_decode
        integer, intent(in) :: snr
        real, intent(in) :: dt
        real, intent(in) :: freq
-       integer, intent(in) :: nbadcrc
        character(len=22), intent(in) :: decoded
      end subroutine ft8_decode_callback
   end interface
@@ -77,13 +76,17 @@ contains
         xdt=candidate(2,icand)
         nsnr0=min(99,nint(10.0*log10(sync) - 25.5))    !### empirical ###
         call timer('ft8b    ',0)
-        call ft8b(dd,newdat,nfqso,ndepth,lsubtract,icand,sync,f1,xdt,apsym,nharderrors,  &
+        call ft8b(dd,newdat,nfqso,ndepth,lsubtract,icand,sync,f1,xdt,   &
-            dmin,nbadcrc,iap,ipass,message,xsnr)
+             apsym,nharderrors,dmin,nbadcrc,iap,ipass,iera,message,xsnr)
         nsnr=xsnr  
         xdt=xdt-0.6
         call timer('ft8b    ',1)
-        if (associated(this%callback)) call this%callback(sync,nsnr,xdt,   &
+        if(nbadcrc.eq.0 .and. associated(this%callback)) then
-            f1,nbadcrc,message)
+           call this%callback(sync,nsnr,xdt,f1,message)
+           write(81,3081) ncand,icand,iera,nharderrors,ipass,          &
+                sync,f1,xdt,dmin,xsnr,message
+3081       format(2i5,i2,i3,i2,2f7.1,3f7.2,1x,a22)
+        endif
       enddo
 !     h=default_header(12000,NMAX)
 !     open(10,file='subtract.wav',status='unknown',access='stream')