mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-03 16:01:18 -05:00
Put in Linrad calc for best pol'n in waterfall; something broke.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@357 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
parent
ab91d6a141
commit
5a5bc9b8e3
@ -134,7 +134,6 @@ subroutine display
|
|||||||
write(20,1040) bm2
|
write(20,1040) bm2
|
||||||
1040 format(a36)
|
1040 format(a36)
|
||||||
enddo
|
enddo
|
||||||
write(*,1040)
|
|
||||||
|
|
||||||
return
|
return
|
||||||
end subroutine display
|
end subroutine display
|
||||||
|
|||||||
@ -19,7 +19,7 @@ subroutine map65a
|
|||||||
parameter (NSMAX=60*96000) !Samples per 60 s file
|
parameter (NSMAX=60*96000) !Samples per 60 s file
|
||||||
integer*2 id(4,NSMAX) !46 MB: raw data from Linrad timf2
|
integer*2 id(4,NSMAX) !46 MB: raw data from Linrad timf2
|
||||||
common/datcom/nutc,newdat2,id
|
common/datcom/nutc,newdat2,id
|
||||||
common/spcom/ip0,ss(4,322,NFFT) !169 MB: half-symbol spectra
|
common/spcom/ip0,ss(5,322,NFFT) !169 MB: half-symbol spectra
|
||||||
data blank/' '/
|
data blank/' '/
|
||||||
data shmsg0/'ATT','RO ','RRR','73 '/
|
data shmsg0/'ATT','RO ','RRR','73 '/
|
||||||
data nfile/0/,nutc0/-999/,nid/0/
|
data nfile/0/,nutc0/-999/,nid/0/
|
||||||
|
|||||||
4
spec.f90
4
spec.f90
@ -15,7 +15,7 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2)
|
|||||||
integer nstep(5)
|
integer nstep(5)
|
||||||
integer b0,c0
|
integer b0,c0
|
||||||
real s(NFFT,NY)
|
real s(NFFT,NY)
|
||||||
common/spcom/ip0,ss(4,322,NFFT) !169 MB: half-symbol spectra
|
common/spcom/ip0,ss(5,322,NFFT) !169 MB: half-symbol spectra
|
||||||
include 'gcom1.f90'
|
include 'gcom1.f90'
|
||||||
include 'gcom2.f90'
|
include 'gcom2.f90'
|
||||||
include 'gcom3.f90'
|
include 'gcom3.f90'
|
||||||
@ -43,7 +43,7 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2)
|
|||||||
do n=1,nadd
|
do n=1,nadd
|
||||||
k=k+1
|
k=k+1
|
||||||
do i=1,NFFT
|
do i=1,NFFT
|
||||||
s(i,j)=s(i,j) + ss(2,k,i) !### ip value is temporary ###
|
s(i,j)=s(i,j) + ss(5,k,i) !### ip value is temporary ###
|
||||||
enddo
|
enddo
|
||||||
enddo
|
enddo
|
||||||
enddo
|
enddo
|
||||||
|
|||||||
30
symspec.f
30
symspec.f
@ -4,7 +4,7 @@ C Compute spectra at four polarizations, using half-symbol steps.
|
|||||||
|
|
||||||
parameter (NFFT=32768)
|
parameter (NFFT=32768)
|
||||||
integer*2 id(4,nz)
|
integer*2 id(4,nz)
|
||||||
real ss(4,322,NFFT)
|
real ss(5,322,NFFT)
|
||||||
real savg(4,NFFT)
|
real savg(4,NFFT)
|
||||||
complex cx(NFFT),cy(NFFT) ! pad to 32k with zeros
|
complex cx(NFFT),cy(NFFT) ! pad to 32k with zeros
|
||||||
complex z
|
complex z
|
||||||
@ -43,23 +43,27 @@ C Compute spectra at four polarizations, using half-symbol steps.
|
|||||||
call four2a(cy,NFFT,1,1,1)
|
call four2a(cy,NFFT,1,1,1)
|
||||||
|
|
||||||
do i=1,NFFT !Save and accumulate power spectra
|
do i=1,NFFT !Save and accumulate power spectra
|
||||||
s=real(cx(i))**2 + aimag(cx(i))**2
|
s1=real(cx(i))**2 + aimag(cx(i))**2
|
||||||
ss(1,n,i)=s ! Pol = 0
|
ss(1,n,i)=s1 ! Pol = 0
|
||||||
savg(1,i)=savg(1,i) + s
|
savg(1,i)=savg(1,i) + s1
|
||||||
|
|
||||||
z=cx(i) + cy(i)
|
z=cx(i) + cy(i)
|
||||||
s=0.5*(real(z)**2 + aimag(z)**2)
|
s2=0.5*(real(z)**2 + aimag(z)**2)
|
||||||
ss(2,n,i)=s ! Pol = 45
|
ss(2,n,i)=s2 ! Pol = 45
|
||||||
savg(2,i)=savg(2,i) + s
|
savg(2,i)=savg(2,i) + s2
|
||||||
|
|
||||||
s=real(cy(i))**2 + aimag(cy(i))**2
|
s3=real(cy(i))**2 + aimag(cy(i))**2
|
||||||
ss(3,n,i)=s ! Pol = 90
|
ss(3,n,i)=s3 ! Pol = 90
|
||||||
savg(3,i)=savg(3,i) + s
|
savg(3,i)=savg(3,i) + s3
|
||||||
|
|
||||||
z=cx(i) - cy(i)
|
z=cx(i) - cy(i)
|
||||||
s=0.5*(real(z)**2 + aimag(z)**2)
|
s4=0.5*(real(z)**2 + aimag(z)**2)
|
||||||
ss(4,n,i)=s ! Pol = 135
|
ss(4,n,i)=s4 ! Pol = 135
|
||||||
savg(4,i)=savg(4,i) + s
|
savg(4,i)=savg(4,i) + s4
|
||||||
|
|
||||||
|
z=cx(i) * conjg(cy(i))
|
||||||
|
ss(5,n,i)=0.5*(s1+s3) + (real(z)**2 + aimag(z)**2 -
|
||||||
|
+ s1*s3)/(s1+s3)
|
||||||
enddo
|
enddo
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
|
|||||||
213
wsjt65.f
213
wsjt65.f
@ -1,213 +0,0 @@
|
|||||||
subroutine wsjt65(dat,npts,cfile6,NClearAve,MinSigdB,
|
|
||||||
+ DFTolerance,NFreeze,NAFC,mode65,Nseg,MouseDF,NAgain,
|
|
||||||
+ ndepth,neme,nsked,idf,idfsh,mycall,hiscall,hisgrid,
|
|
||||||
+ lumsg,lcum,nspecial,ndf,nstest,dfsh,
|
|
||||||
+ snrsh,NSyncOK,ccfblue,ccfred,ndiag,nwsh)
|
|
||||||
|
|
||||||
C Orchestrates the process of decoding JT65 messages, using data that
|
|
||||||
C have been 2x downsampled. The search for shorthand messages has
|
|
||||||
C already been done.
|
|
||||||
|
|
||||||
real dat(npts) !Raw data
|
|
||||||
integer DFTolerance
|
|
||||||
logical first
|
|
||||||
logical lcum
|
|
||||||
character decoded*22,cfile6*6,special*5,cooo*3
|
|
||||||
character*22 avemsg1,avemsg2,deepmsg
|
|
||||||
character*67 line,ave1,ave2
|
|
||||||
character*1 csync,c1
|
|
||||||
character*12 mycall
|
|
||||||
character*12 hiscall
|
|
||||||
character*6 hisgrid
|
|
||||||
real ccfblue(-5:540),ccfred(-224:224)
|
|
||||||
integer itf(2,9)
|
|
||||||
include 'avecom.h'
|
|
||||||
data first/.true./,ns10/0/,ns20/0/
|
|
||||||
data itf/0,0, 1,0, -1,0, 0,-1, 0,1, 1,-1, 1,1, -1,-1, -1,1/
|
|
||||||
save
|
|
||||||
|
|
||||||
if(first) then
|
|
||||||
call setup65 !Initialize pseudo-random arrays
|
|
||||||
nsave=0
|
|
||||||
first=.false.
|
|
||||||
ave1=' '
|
|
||||||
ave2=' '
|
|
||||||
endif
|
|
||||||
|
|
||||||
naggressive=0
|
|
||||||
if(ndepth.ge.2) naggressive=1
|
|
||||||
nq1=3
|
|
||||||
nq2=6
|
|
||||||
if(naggressive.eq.1) nq1=1
|
|
||||||
|
|
||||||
if(NClearAve.ne.0) then
|
|
||||||
nsave=0 !Clear the averaging accumulators
|
|
||||||
ns10=0
|
|
||||||
ns20=0
|
|
||||||
ave1=' '
|
|
||||||
ave2=' '
|
|
||||||
endif
|
|
||||||
if(MinSigdB.eq.99 .or. MinSigdB.eq.-99) then
|
|
||||||
ns10=0 !For Include/Exclude ?
|
|
||||||
ns20=0
|
|
||||||
endif
|
|
||||||
|
|
||||||
C Attempt to synchronize: look for sync tone, get DF and DT.
|
|
||||||
call sync65(dat,npts,DFTolerance,NFreeze,MouseDF,
|
|
||||||
+ mode65,dtx,dfx,snrx,snrsync,ccfblue,ccfred,flip,width)
|
|
||||||
csync=' '
|
|
||||||
decoded=' '
|
|
||||||
deepmsg=' '
|
|
||||||
special=' '
|
|
||||||
cooo=' '
|
|
||||||
ncount=-1 !Flag for RS decode of current record
|
|
||||||
ncount1=-1 !Flag for RS Decode of ave1
|
|
||||||
ncount2=-1 !Flag for RS Decode of ave2
|
|
||||||
NSyncOK=0
|
|
||||||
nqual1=0
|
|
||||||
nqual2=0
|
|
||||||
|
|
||||||
if(nsave.lt.MAXAVE .and. (NAgain.eq.0 .or. NClearAve.eq.1))
|
|
||||||
+ nsave=nsave+1
|
|
||||||
if(nsave.le.0) go to 900 !Prevent bounds error
|
|
||||||
|
|
||||||
nflag(nsave)=0 !Clear the "good sync" flag
|
|
||||||
iseg(nsave)=Nseg !Set the RX segment to 1 or 2
|
|
||||||
nsync=nint(snrsync-3.0)
|
|
||||||
nsnr=nint(snrx)
|
|
||||||
if(nsnr.lt.-30 .or. nsync.lt.0) nsync=0
|
|
||||||
nsnrlim=-32
|
|
||||||
|
|
||||||
C Good Sync takes precedence over a shorthand message:
|
|
||||||
if(nsync.ge.MinSigdB .and. nsnr.ge.nsnrlim .and.
|
|
||||||
+ nsync.ge.nstest) nstest=0
|
|
||||||
|
|
||||||
if(nstest.gt.0) then
|
|
||||||
dfx=dfsh
|
|
||||||
nsync=nstest
|
|
||||||
nsnr=snrsh
|
|
||||||
dtx=1.
|
|
||||||
ccfblue(-5)=-999.0
|
|
||||||
if(nspecial.eq.1) special='ATT '
|
|
||||||
if(nspecial.eq.2) special='RO '
|
|
||||||
if(nspecial.eq.3) special='RRR '
|
|
||||||
if(nspecial.eq.4) special='73 '
|
|
||||||
NSyncOK=1 !Mark this RX file as good (for "Save Decoded")
|
|
||||||
if(NFreeze.eq.0 .or. DFTolerance.ge.200) special(5:5)='?'
|
|
||||||
width=nwsh
|
|
||||||
idf=idfsh
|
|
||||||
go to 200
|
|
||||||
endif
|
|
||||||
|
|
||||||
if(nsync.lt.MinSigdB .or. nsnr.lt.nsnrlim) go to 200
|
|
||||||
|
|
||||||
C If we get here, we have achieved sync!
|
|
||||||
NSyncOK=1
|
|
||||||
nflag(nsave)=1 !Mark this RX file as good
|
|
||||||
csync='*'
|
|
||||||
if(flip.lt.0.0) then
|
|
||||||
csync='#'
|
|
||||||
cooo='O ?'
|
|
||||||
endif
|
|
||||||
|
|
||||||
call decode65(dat,npts,dtx,dfx,flip,ndepth,neme,nsked,
|
|
||||||
+ mycall,hiscall,hisgrid,mode65,nafc,decoded,
|
|
||||||
+ ncount,deepmsg,qual)
|
|
||||||
if(ncount.eq.-999) qual=0 !Bad data
|
|
||||||
200 kvqual=0
|
|
||||||
if(ncount.ge.0) kvqual=1
|
|
||||||
nqual=qual
|
|
||||||
if(ndiag.eq.0 .and. nqual.gt.10) nqual=10
|
|
||||||
if(nqual.ge.nq1 .and.kvqual.eq.0) decoded=deepmsg
|
|
||||||
|
|
||||||
ndf=nint(dfx)
|
|
||||||
if(flip.lt.0.0 .and. (kvqual.eq.1 .or. nqual.ge.nq2)) cooo='OOO'
|
|
||||||
if(kvqual.eq.0.and.nqual.ge.nq1.and.nqual.lt.nq2) cooo(2:3)=' ?'
|
|
||||||
if(decoded.eq.' ') cooo=' '
|
|
||||||
do i=1,22
|
|
||||||
c1=decoded(i:i)
|
|
||||||
if(c1.ge.'a' .and. c1.le.'z') decoded(i:i)=char(ichar(c1)-32)
|
|
||||||
enddo
|
|
||||||
jdf=ndf+idf
|
|
||||||
if(nstest.gt.0) jdf=ndf
|
|
||||||
write(line,1010) cfile6,nsync,nsnr,dtx-1.0,jdf,
|
|
||||||
+ nint(width),csync,special,decoded(1:19),cooo,kvqual,nqual
|
|
||||||
1010 format(a6,i3,i5,f5.1,i5,i3,1x,a1,1x,a5,a19,1x,a3,i4,i4)
|
|
||||||
|
|
||||||
C Blank all end-of-line stuff if no decode
|
|
||||||
if(line(31:40).eq.' ') line=line(:30)
|
|
||||||
|
|
||||||
C Blank DT if shorthand message (### wrong logic? ###)
|
|
||||||
if(special.ne.' ') then
|
|
||||||
line(15:19)=' '
|
|
||||||
line=line(:35)
|
|
||||||
ccfblue(-5)=-9999.0
|
|
||||||
! if(ndiag.gt.0) write(line(51:57),1012) iderrsh,idriftsh
|
|
||||||
! 1012 format(i3,i4)
|
|
||||||
else
|
|
||||||
nspecial=0
|
|
||||||
endif
|
|
||||||
|
|
||||||
if(lcum) write(21,1011) line
|
|
||||||
1011 format(a67)
|
|
||||||
C Write decoded msg unless this is an "Exclude" request:
|
|
||||||
if(MinSigdB.lt.99) write(lumsg,1011) line
|
|
||||||
|
|
||||||
if(nsave.ge.1) call avemsg65(1,mode65,ndepth,avemsg1,nused1,
|
|
||||||
+ nq1,nq2,neme,nsked,mycall,hiscall,hisgrid,qual1,
|
|
||||||
+ ns1,ncount1)
|
|
||||||
if(nsave.ge.1) call avemsg65(2,mode65,ndepth,avemsg2,nused2,
|
|
||||||
+ nq1,nq2,neme,nsked,mycall,hiscall,hisgrid,qual2,
|
|
||||||
+ ns2,ncount2)
|
|
||||||
nqual1=qual1
|
|
||||||
nqual2=qual2
|
|
||||||
if(ndiag.eq.0 .and. nqual1.gt.10) nqual1=10
|
|
||||||
if(ndiag.eq.0 .and. nqual2.gt.10) nqual2=10
|
|
||||||
nc1=0
|
|
||||||
nc2=0
|
|
||||||
if(ncount1.ge.0) nc1=1
|
|
||||||
if(ncount2.ge.0) nc2=1
|
|
||||||
|
|
||||||
C Write the average line
|
|
||||||
! if(ns1.ge.1 .and. ns1.ne.ns10) then
|
|
||||||
if(ns1.ge.1) then
|
|
||||||
if(ns1.lt.10) write(ave1,1021) cfile6,1,nused1,ns1,avemsg1,
|
|
||||||
+ nc1,nqual1
|
|
||||||
1021 format(a6,i3,i4,'/',i1,20x,a19,i8,i4)
|
|
||||||
if(ns1.ge.10 .and. nsave.le.99) write(ave1,1022) cfile6,
|
|
||||||
+ 1,nused1,ns1,avemsg1,nc1,nqual1
|
|
||||||
1022 format(a6,i3,i4,'/',i2,19x,a19,i8,i4)
|
|
||||||
if(ns1.ge.100) write(ave1,1023) cfile6,1,nused1,ns1,
|
|
||||||
+ avemsg1,nc1,nqual1
|
|
||||||
1023 format(a6,i3,i4,'/',i3,18x,a19,i8,i4)
|
|
||||||
if(lcum .and. (avemsg1.ne.' '))
|
|
||||||
+ write(21,1011) ave1
|
|
||||||
ns10=ns1
|
|
||||||
endif
|
|
||||||
|
|
||||||
C If Monitor segment #2 is available, write that line also
|
|
||||||
! if(ns2.ge.1 .and. ns2.ne.ns20) then !***Why the 2nd part?? ***
|
|
||||||
if(ns2.ge.1) then
|
|
||||||
if(ns2.lt.10) write(ave2,1021) cfile6,2,nused2,ns2,avemsg2,
|
|
||||||
+ nc2,nqual2
|
|
||||||
if(ns2.ge.10 .and. nsave.le.99) write(ave2,1022) cfile6,
|
|
||||||
+ 2,nused2,ns2,avemsg2,nc2,nqual2
|
|
||||||
if(ns2.ge.100) write(ave2,1023) cfile6,2,nused2,ns2,avemsg2,
|
|
||||||
+ nc2,nqual2
|
|
||||||
if(lcum .and. (avemsg2.ne.' '))
|
|
||||||
+ write(21,1011) ave2
|
|
||||||
ns20=ns2
|
|
||||||
endif
|
|
||||||
|
|
||||||
if(ave1(31:40).eq.' ') ave1=ave1(:30)
|
|
||||||
if(ave2(31:40).eq.' ') ave2=ave2(:30)
|
|
||||||
write(12,1011) ave1
|
|
||||||
write(12,1011) ave2
|
|
||||||
call flushqqq(12)
|
|
||||||
|
|
||||||
if(lumsg.ne.6) end file 11
|
|
||||||
|
|
||||||
900 continue
|
|
||||||
|
|
||||||
return
|
|
||||||
end
|
|
||||||
Loading…
Reference in New Issue
Block a user