Minor code cleanup.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-03-08 18:36:42 +00:00
parent c06d2305a0
commit 6fcd4b8366
2 changed files with 7 additions and 12 deletions

View File

@ -253,7 +253,7 @@ contains
endif endif
if(nfanoave.gt.0) then if(nfanoave.gt.0) then
! Fano succeeded: report the mess AVG FANO OK ! Fano succeeded: report the message AVG FANO OK
if (associated (this%decode_callback)) then if (associated (this%decode_callback)) then
call this%decode_callback(nutc,nsnr,dtx,nfreq,.true.,csync, & call this%decode_callback(nutc,nsnr,dtx,nfreq,.true.,csync, &
.false.,avemsg,0.,ich,.true.,nfanoave) .false.,avemsg,0.,ich,.true.,nfanoave)

View File

@ -172,14 +172,9 @@ contains
if(rtt.gt.r0(n)) cycle if(rtt.gt.r0(n)) cycle
endif endif
! !### Suppress false decodes in crowded HF bands ###
! if(naggressive.eq.0 .and. ntrials.le.10000) then
! if(ntry.eq.ntrials) then
! if(nhard_min.ge.42 .or. ntotal_min.ge.71) cycle
! endif
! endif
if(decoded.eq.decoded0 .and. abs(freq-freq0).lt. 3.0 .and. & if(decoded.eq.decoded0 .and. abs(freq-freq0).lt. 3.0 .and. &
minsync.ge.0) cycle !Don't display dupes minsync.ge.0) cycle !Don't display dupes
if(decoded.ne.' ' .or. minsync.lt.0) then if(decoded.ne.' ' .or. minsync.lt.0) then
if( nsubtract .eq. 1 ) then if( nsubtract .eq. 1 ) then
call timer('subtr65 ',0) call timer('subtr65 ',0)
@ -209,19 +204,19 @@ contains
dec(ndecoded)%sync=sync2 dec(ndecoded)%sync=sync2
dec(ndecoded)%decoded=decoded dec(ndecoded)%decoded=decoded
nqual=min(qual,9999.0) nqual=min(qual,9999.0)
! if(nqual.gt.10) nqual=10
if (associated(this%callback)) then if (associated(this%callback)) then
call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift,decoded & call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, &
,nft,nqual,ncandidates,ntry,ntotal_min,nhard_min,naggressive) decoded,nft,nqual,ncandidates,ntry,ntotal_min, &
nhard_min,naggressive)
end if end if
endif endif
decoded0=decoded decoded0=decoded
freq0=freq freq0=freq
if(decoded0.eq.' ') decoded0='*' if(decoded0.eq.' ') decoded0='*'
endif endif
enddo !candidate loop enddo !Candidate loop
if(ndecoded.lt.1) exit if(ndecoded.lt.1) exit
enddo !two-pass loop enddo !Two-pass loop
return return
end subroutine decode end subroutine decode