Force naggressive=0 when in JT9+JT65 mode.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6331 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-01-01 15:33:48 +00:00
parent 0e15a4cd5c
commit fecffe8ed8
2 changed files with 8 additions and 5 deletions

View File

@ -226,10 +226,10 @@ contains
write(13,1012) utc,nint(sync),snr,dt,float(freq),drift,decoded,ft
1012 format(i4.4,i4,i5,f6.1,f8.0,i4,3x,a22,' JT65',i4)
call flush(6)
! write(79,3001) utc,sync,snr,dt,freq,candidates, &
! hard_min,total_min,rtt,tries,ft,min(qual,99),decoded
!3001 format(i4.4,f5.1,i4,f5.1,i5,i6,i3,i4,f6.3,i8,i2,i3,1x,a22)
! flush(79)
write(79,3001) utc,sync,snr,dt,freq,candidates, &
hard_min,total_min,rtt,tries,ft,min(qual,99),decoded
3001 format(i4.4,f5.1,i4,f5.1,i5,i6,i3,i4,f6.3,i8,i2,i3,1x,a22)
flush(79)
!$omp end critical(decode_results)
select type(this)

View File

@ -1739,7 +1739,10 @@ void MainWindow::decode() //decode()
dec_data.params.nfSplit=m_wideGraph->Fmin();
dec_data.params.nfb=m_wideGraph->Fmax();
dec_data.params.ntol=m_Ftol;
if(m_mode=="JT9+JT65") dec_data.params.ntol=20;
if(m_mode=="JT9+JT65") {
dec_data.params.ntol=20;
dec_data.params.naggressive=0;
}
if(dec_data.params.nutc < m_nutc0) m_RxLog = 1; //Date and Time to all.txt
m_nutc0=dec_data.params.nutc;
dec_data.params.ntxmode=9;