Suppress garbage "text decodes" with flip=-1.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@487 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-10 16:57:29 +00:00
parent 893566ad97
commit 40f3d1e1ce
4 changed files with 11 additions and 7 deletions

View File

@ -8,6 +8,7 @@ C Decodes averaged JT65 data for the specified segment (mseg=1 or 2).
character decoded*22,deepmsg*22 character decoded*22,deepmsg*22
character mycall*12,hiscall*12,hisgrid*6 character mycall*12,hiscall*12,hisgrid*6
real s3(64,63) real s3(64,63)
logical ltext
common/ave/ppsave(64,63,MAXAVE),nflag(MAXAVE),nsave,iseg(MAXAVE) common/ave/ppsave(64,63,MAXAVE),nflag(MAXAVE),nsave,iseg(MAXAVE)
C Count the available spectra for this Monitor segment (mseg=1 or 2), C Count the available spectra for this Monitor segment (mseg=1 or 2),
@ -36,7 +37,7 @@ C Compute the average of all flagged spectra for this segment.
enddo enddo
nadd=nused*mode65 nadd=nused*mode65
call extract(s3,nadd,ncount,decoded) !Extract the message call extract(s3,nadd,ncount,decoded,ltext) !Extract the message
if(ncount.lt.0) decoded=' ' if(ncount.lt.0) decoded=' '
nqual=0 nqual=0

View File

@ -3,7 +3,7 @@
real s2(256,126) real s2(256,126)
real s3(64,63) real s3(64,63)
logical first logical first,ltext
character decoded*22,deepmsg*22 character decoded*22,deepmsg*22
character mycall*12,hiscall*12,hisgrid*6 character mycall*12,hiscall*12,hisgrid*6
! include 'avecom.h' ! include 'avecom.h'
@ -25,10 +25,11 @@
mode65=2 mode65=2
nadd=mode65 nadd=mode65
call extract(s3,nadd,ncount,nhist,decoded) !Extract the message call extract(s3,nadd,ncount,nhist,decoded,ltext) !Extract the message
C Suppress "birdie messages": C Suppress "birdie messages" and other garbage decodes:
if(decoded(1:7).eq.'000AAA ') ncount=-1 if(decoded(1:7).eq.'000AAA ') ncount=-1
if(decoded(1:7).eq.'0L6MWK ') ncount=-1 if(decoded(1:7).eq.'0L6MWK ') ncount=-1
if(flip.lt.0.0 .and. ltext) ncount=-1
nkv=1 nkv=1
if(ncount.lt.0) then if(ncount.lt.0) then
nkv=0 nkv=0

View File

@ -1,11 +1,11 @@
subroutine extract(s3,nadd,ncount,nhist,decoded) subroutine extract(s3,nadd,ncount,nhist,decoded,ltext)
real s3(64,63) real s3(64,63)
real tmp(4032) real tmp(4032)
character decoded*22 character decoded*22
integer era(51),dat4(12),indx(64) integer era(51),dat4(12),indx(64)
integer mrsym(63),mr2sym(63),mrprob(63),mr2prob(63) integer mrsym(63),mr2sym(63),mrprob(63),mr2prob(63)
logical first logical first,ltext
data first/.true./,nsec1/0/ data first/.true./,nsec1/0/
save save
@ -55,8 +55,10 @@
endif endif
read(22,rec=2) nsec2,ncount,dat4 read(22,rec=2) nsec2,ncount,dat4
decoded=' ' decoded=' '
ltext=.false.
if(ncount.ge.0) then if(ncount.ge.0) then
call unpackmsg(dat4,decoded) !Unpack the user message call unpackmsg(dat4,decoded) !Unpack the user message
if(iand(dat4(10),8).ne.0) ltext=.true.
endif endif
endif endif
20 if(ndec.eq.0) then 20 if(ndec.eq.0) then

View File

@ -1,4 +1,4 @@
#-------------------------------------------------------------------- MAP65 #--------------------------------------------------------------------- MAP65
# $Date$ $Revision$ # $Date$ $Revision$
# #
from Tkinter import * from Tkinter import *