diff --git a/lib/jt65a.f90 b/lib/jt65a.f90 index 3ed83549e..2f4698dc0 100644 --- a/lib/jt65a.f90 +++ b/lib/jt65a.f90 @@ -141,7 +141,7 @@ subroutine jt65a(dd0,npts,newdat,nutc,nf1,nf2,nfqso,ntol,nsubmode, & dec(ndecoded)%dt=dtx dec(ndecoded)%sync=sync2 dec(ndecoded)%decoded=decoded - nqual=qual + nqual=min(qual,9999.0) ! if(nqual.gt.10) nqual=10 write(*,1010) nutc,nsnr,dtx-1.0,nfreq,decoded 1010 format(i4.4,i4,f5.1,i5,1x,'#',1x,a22) @@ -150,11 +150,11 @@ subroutine jt65a(dd0,npts,newdat,nutc,nf1,nf2,nfqso,ntol,nsubmode, & 1012 format(i4.4,i4,i5,f6.1,f8.0,i4,3x,a22,' JT65',i4) call flush(6) call flush(13) -!! write(79,3001) nutc,nint(sync1),nsnr,dtx-1.0,nfreq,ncandidates, & -! write(79,3001) nutc,sync1,nsnr,dtx-1.0,nfreq,ncandidates, & -! nhard_min,ntotal_min,ntry,naggressive,nft,nqual,decoded -!3001 format(i4.4,f6.2,i4,f6.2,i5,i7,i3,i4,i8,i3,i2,i5,1x,a22) -! flush(79) + ! write(79,3001) nutc,nint(sync1),nsnr,dtx-1.0,nfreq,ncandidates, & + write(79,3001) nutc,sync1,nsnr,dtx-1.0,nfreq,ncandidates, & + nhard_min,ntotal_min,ntry,naggressive,nft,nqual,decoded + 3001 format(i4.4,f6.2,i4,f6.2,i5,i7,i3,i4,i8,i3,i2,i5,1x,a22) + flush(79) endif decoded0=decoded freq0=freq diff --git a/lib/jt9.f90 b/lib/jt9.f90 index 6704e63f1..13f69e5b1 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -250,10 +250,12 @@ program jt9 shared_data%params%nzhsym=181 shared_data%params%ndepth=ndepth shared_data%params%dttol=3. - shared_data%params%minsync=-1 !### TEST ONLY - shared_data%params%naggressive=1 + shared_data%params%minsync=-1 !### TEST ONLY + shared_data%params%nfqso=1500 !### TEST ONLY + mycall="K1ABC " !### TEST ONLY + shared_data%params%naggressive=10 shared_data%params%n2pass=1 - shared_data%params%nranera=8 ! ntrials=10000 + shared_data%params%nranera=8 ! ntrials=10000 shared_data%params%nrobust=0 shared_data%params%nexp_decode=nexp_decode shared_data%params%mycall=mycall diff --git a/lib/stats.f90 b/lib/stats.f90 index 3a099116c..36526c8fd 100644 --- a/lib/stats.f90 +++ b/lib/stats.f90 @@ -13,14 +13,16 @@ program stats ttol=0.1 nftol=1 write(*,1000) -1000 format(' SNR Nsigs Sync BM FT Hint Total False BadSync'/ & - 67('-')) +1000 format(' SNR Files Sync BM FT Hint Total False BadSync'/ & + 56('-')) do ifile=1,nargs call getarg(ifile,infile) open(10,file=infile,status='old') - i1=index(infile,".") - read(infile(i1+1:i1+2),*) snrgen + i1=index(infile,".")+1 + i2=40 + if(index(infile,"_").gt.1) i2=index(infile,"_") - 1 + read(infile(i1:i2),*) snrgen snrgen=-snrgen nsynced=0 nbm=0 @@ -57,7 +59,7 @@ program stats endif enddo -100 write(*,1100) snrgen,10*nutc,nsynced,nbm,nftok,nhint,ngood,nbad, & +100 write(*,1100) snrgen,nutc,nsynced,nbm,nftok,nhint,ngood,nbad, & nbadsync 1100 format(f5.1,8i6) enddo