diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 98ad4c7c3..de3b5b6d9 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -248,7 +248,7 @@ contains if(ft.ge.80) then nft=ft-100 csync=': ' - if(snr.gt.-30) csync=':*' + if(snr.gt.-30 .or. nft.ge.0) csync=':*' if(nft.lt.0) then write(*,1009) params%nutc,snr,dt,freq,csync,decoded else diff --git a/lib/qra64a.f90 b/lib/qra64a.f90 index 9dac72745..04bf8a313 100644 --- a/lib/qra64a.f90 +++ b/lib/qra64a.f90 @@ -11,11 +11,11 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mycall_12,hiscall_12, & complex c00(0:360000) !Complex spectrum of dd() complex c0(0:360000) !Complex spectrum of dd() ! integer*8 count0,count1,clkfreq - integer icos7(0:6) - integer dat4(12) real a(3) - real dd(NMAX) - real s3(0:63,1:63) + real dd(NMAX) !Raw data sampled at 12000 Hz + real s3(0:63,1:63) !Symbol spectra + integer dat4(12) !Decoded message (as 12 integers) + integer icos7(0:6) data icos7/2,5,6,0,4,1,3/ !Costas 7x7 pattern data nc1z/-1/,nc2z/-1/,ng2z/-1/ save @@ -28,7 +28,6 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mycall_12,hiscall_12, & call packcall(mycall,nc1,ltext) call packcall(hiscall,nc2,ltext) call packgrid(hisgrid,ng2,ltext) - if(nc1.ne.nc1z .or. nc2.ne.nc2z .or. ng2.ne.ng2z) then do naptype=0,5 call qra64_dec(s3,nc1,nc2,ng2,naptype,1,dat4,snr2,irc) @@ -39,12 +38,9 @@ subroutine qra64a(dd,nutc,nf1,nf2,nfqso,ntol,mycall_12,hiscall_12, & endif maxf1=5 -! maxf1=0 call sync64(dd,nf1,nf2,nfqso,ntol,maxf1,dtx,f0,jpk,kpk,snr1,c00) -!### npts2=216000 - snr2=-99. naptype=4 do itry0=1,3 idf0=itry0/2 diff --git a/lib/sync64.f90 b/lib/sync64.f90 index 63fe2e029..1e071250a 100644 --- a/lib/sync64.f90 +++ b/lib/sync64.f90 @@ -43,7 +43,6 @@ subroutine sync64(dd,nf1,nf2,nfqso,ntol,maxf1,dtx,f0,jpk,kpk,snrdb,c0) nfft2=nfft1/3 df1=12000.0/nfft1 fac=2.0/nfft1 -! x=fac*dd(1:nfft1) do i=0,nfft1/2 c0(i)=fac*cmplx(dd(1+2*i),dd(2+2*i)) enddo @@ -108,22 +107,10 @@ subroutine sync64(dd,nf1,nf2,nfqso,ntol,maxf1,dtx,f0,jpk,kpk,snrdb,c0) ja=max(0,jpk-2*jstep) jb=min(336000-NSPC,jpk+2*jstep) jstep=10 -! ka=kpk -! kb=kpk enddo -!### -! rewind 73 -! do i=ia,ib -! write(73,3201) i*df3,s0a(i),db(s0a(i)) -!3201 format(3f10.3) -! enddo -! flush(73) -!### - - write(17) ia,ib,s0a(ia:ib) !Save red() + write(17) ia,ib,s0a(ia:ib) !Save data for red curve close(17) - snrdb=10.0*log10(snr)-39.0 return