diff --git a/q65w/libm65/CMakeLists.txt b/q65w/libm65/CMakeLists.txt index bc47030fb..7779289ab 100644 --- a/q65w/libm65/CMakeLists.txt +++ b/q65w/libm65/CMakeLists.txt @@ -20,7 +20,6 @@ set (libm65_FSRCS ftnquit.f90 q65b.f90 geocentric.f90 - getdphi.f90 getpfx1.f90 getpfx2.f90 graycode.f90 diff --git a/q65w/libm65/decode0.f90 b/q65w/libm65/decode0.f90 index b3c017a33..ae52c7c1a 100644 --- a/q65w/libm65/decode0.f90 +++ b/q65w/libm65/decode0.f90 @@ -40,8 +40,6 @@ subroutine decode0(dd,ss,savg,nstandalone) enddo 10 rmsdd=1.5*i endif - ndphi=0 - if(iand(nrxlog,8).ne.0) ndphi=1 if(mycall.ne.mycall0 .or. hiscall.ne.hiscall0 .or. & hisgrid.ne.hisgrid0 .or. mcall3.ne.0 .or. neme.ne.neme0) mcall3b=1 @@ -52,8 +50,8 @@ subroutine decode0(dd,ss,savg,nstandalone) neme0=neme call timer('map65a ',0) - call map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & - mousedf,mousefqso,nagain,ndecdone,nfshift,ndphi,max_drift, & + call map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & + mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, & nfcal,nkeep,mcall3b,nsum,nsave,nxant,mycall,mygrid, & neme,ndepth,nstandalone,hiscall,hisgrid,nhsym,nfsample, & ndiskdat,nxpol,nmode,ndop00) diff --git a/q65w/libm65/map65a.f90 b/q65w/libm65/map65a.f90 index f3bd5aa5b..a52d6c95d 100644 --- a/q65w/libm65/map65a.f90 +++ b/q65w/libm65/map65a.f90 @@ -1,5 +1,5 @@ -subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & - mousedf,mousefqso,nagain,ndecdone,nfshift,ndphi,max_drift, & +subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & + mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, & nfcal,nkeep,mcall3b,nsum,nsave,nxant,mycall,mygrid, & neme,ndepth,nstandalone,hiscall,hisgrid,nhsym,nfsample, & ndiskdat,nxpol,nmode,ndop00) @@ -82,23 +82,16 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & mcall3a=mcall3b mousefqso0=mousefqso - if(.not.xpol) ndphi=0 nsum=0 -!### Should use AppDir! ### -! open(23,file='CALL3.TXT',status='unknown') - df=96000.0/NFFT !df = 96000/NFFT = 2.930 Hz if(nfsample.eq.95238) df=95238.1/NFFT ftol=0.010 !Frequency tolerance (kHz) - dphi=idphi/57.2957795 foffset=0.001*(1270 + nfcal) !Offset from sync tone, plus CAL fqso=mousefqso + foffset - 0.5*(nfa+nfb) + nfshift !fqso at baseband (khz) iloop=0 -2 if(ndphi.eq.1) dphi=30*iloop/57.2957795 - - if(nutc.ne.nutc0) nfile=nfile+1 +2 if(nutc.ne.nutc0) nfile=nfile+1 nutc0=nutc nqd=0 @@ -204,39 +197,14 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & decoded(1:4).eq.'73 ') then nsync2=nint(1.33*s2db + 2.0) endif - - if(nxant.ne.0) then - npol=npol-45 - if(npol.lt.0) npol=npol+180 - endif - - cmode='#A' - if(mode65.eq.2) cmode='#B' - if(mode65.eq.4) cmode='#C' -! write(26,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, & -! nsync2,nutc,decoded,cp,cmode -!1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i5.4,4x,a22,2x,a1,3x,a2) - ndecodes=ndecodes+1 -! write(21,1100) f0,ndf,dt,npol,nsync2,nutc,decoded,cp, & -! cmode(1:1),cmode(2:2) -!1100 format(f8.3,i5,f5.1,2i4,i5.4,2x,a22,2x,a1,3x,a1,1x,a1) endif - endif j=j+nsiz(n) enddo !i=1,km - -! write(26,1015) nutc -!1015 format(37x,i6.4,' ') -! call flush(21) -! call flush(26) -! call display(nkeep,ftol) ndecdone=2 900 continue -! close(23) call flush(12) - ndphi=0 mcall3b=mcall3a return diff --git a/q65w/libm65/symspec.f90 b/q65w/libm65/symspec.f90 index 55aa3110c..1a0dd90a6 100644 --- a/q65w/libm65/symspec.f90 +++ b/q65w/libm65/symspec.f90 @@ -26,7 +26,7 @@ subroutine symspec(k,nxpol,ndiskdat,nb,nbslider,idphi,nfsample, & common/datcom/dd(4,5760000),ss(4,322,NFFT),savg(NFFT),fcenter,nutc, & junk(NJUNK) real*4 ssz5a(NFFT),w(NFFT),w2a(NFFT),w2b(NFFT) - complex z,zfac + complex z complex zsumx,zsumy complex cx(NFFT),cy(NFFT) complex cx00(NFFT),cy00(NFFT) @@ -113,8 +113,6 @@ subroutine symspec(k,nxpol,ndiskdat,nb,nbslider,idphi,nfsample, & i=0 fac=0.0002 - dphi=idphi/57.2957795 - zfac=fac*cmplx(cos(dphi),sin(dphi)) do j=ja,jb !Copy data into cx, cy x1=dd(1,j) x2=dd(2,j) @@ -127,7 +125,7 @@ subroutine symspec(k,nxpol,ndiskdat,nb,nbslider,idphi,nfsample, & endif i=i+1 cx(i)=fac*cmplx(x1,x2) - cy(i)=zfac*cmplx(x3,x4) !NB: cy includes dphi correction + cy(i)=cmplx(x3,x4) !NB: cy includes dphi correction enddo if(nzap/178.lt.50 .and. (ndiskdat.eq.0 .or. ihsym.lt.280)) then