diff --git a/lib/ccf2.f90 b/lib/ccf2.f90 index 194608d18..42392d67a 100644 --- a/lib/ccf2.f90 +++ b/lib/ccf2.f90 @@ -1,6 +1,7 @@ subroutine ccf2(ss,nz,nflip,ccfbest,xlagpk) - parameter (LAGMIN=-86,LAGMAX=258) +! parameter (LAGMIN=-86,LAGMAX=258) + parameter (LAGMIN=-112,LAGMAX=258) ! Look for DT from -3.6s to +5.0s real ss(nz) real ccf(-LAGMAX:LAGMAX) integer npr(126) diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index c0eb9d06d..ed6360e20 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -136,11 +136,6 @@ contains endif endif enddo -! h=default_header(12000,NMAX) -! open(10,file='subtract.wav',status='unknown',access='stream') -! iwave=nint(dd) -! write(10) h,iwave -! close(10) enddo return end subroutine decode diff --git a/lib/jt65_decode.f90 b/lib/jt65_decode.f90 index e4e4d3a2f..f0dcb62af 100644 --- a/lib/jt65_decode.f90 +++ b/lib/jt65_decode.f90 @@ -138,7 +138,7 @@ contains nvec=1000 else npass=4 - nvec=2000 + nvec=1000 endif endif do ipass=1,npass @@ -226,7 +226,6 @@ contains sync1=ca(icand)%sync dtx=ca(icand)%dt freq=ca(icand)%freq -!write(*,*) icand,sync1,dtx,freq,ndepth,bVHF,mode65 if(bVHF) then flip=ca(icand)%flip nflip=flip @@ -299,9 +298,8 @@ contains endif n=naggressive rtt=0.001*nrtt1000 -!write(*,*) 'nft ',nft,minsync,nspecial if(nft.lt.2 .and. minsync.ge.0 .and. nspecial.eq.0) then -!write(*,*) 'naggressive ',n,nhard_min,ntotal_min,rtt +!write(*,*) dtx,freq,nft,minsync,nhard_min,ntotal_min,rtt if(nhard_min.gt.50) cycle if(nhard_min.gt.h0(n)) cycle if(ntotal_min.gt.d0(n)) cycle diff --git a/lib/slope.f90 b/lib/slope.f90 index b374ee801..e84209795 100644 --- a/lib/slope.f90 +++ b/lib/slope.f90 @@ -1,7 +1,7 @@ subroutine slope(y,npts,xpk) ! Remove best-fit slope from data in y(i). When fitting the straight line, -! ignore the peak around xpk +/- 2 bins +! ignore the peak around xpk +/- 4 bins real y(npts) @@ -30,9 +30,9 @@ subroutine slope(y,npts,xpk) sq=0. do i=1,npts y(i)=y(i)-(a + b*i) - if(abs(i-xpk).gt.2.0) sq=sq + y(i)**2 + if(abs(i-xpk).gt.4.0) sq=sq + y(i)**2 enddo - rms=sqrt(sq/(sumw-2.0)) + rms=sqrt(sq/(sumw-4.0)) y=y/rms return diff --git a/lib/symspec65.f90 b/lib/symspec65.f90 index 522fdadae..02885bf30 100644 --- a/lib/symspec65.f90 +++ b/lib/symspec65.f90 @@ -43,9 +43,7 @@ subroutine symspec65(dd,npts,nqsym,savg) first=.false. endif -! do j=1,nhsym do j=1,nqsym -! i0=(j-1)*hstep i0=(j-1)*qstep x=fac1*w*dd(i0+1:i0+NFFT) call four2a(c,NFFT,1,-1,0) !r2c forward FFT diff --git a/lib/sync65.f90 b/lib/sync65.f90 index c759d5481..e0bc924a0 100644 --- a/lib/sync65.f90 +++ b/lib/sync65.f90 @@ -1,10 +1,7 @@ -!subroutine sync65(ss,nfa,nfb,naggressive,ntol,nqsym,ca,ncand,nrobust, & -! bVHF) subroutine sync65(nfa,nfb,naggressive,ntol,nqsym,ca,ncand,nrobust, & bVHF) parameter (NSZ=3413,NFFT=8192,MAXCAND=300) -! real ss(322,NSZ) real ss(552,NSZ) real ccfblue(-32:82) !CCF with pseudorandom sequence real ccfred(NSZ) !Peak of ccfblue, as function of freq @@ -41,7 +38,6 @@ subroutine sync65(nfa,nfb,naggressive,ntol,nqsym,ca,ncand,nrobust, & ccfmax=0. ipk=0 do i=ia,ib -! call xcor(ss,i,nqsym,nsym,lag1,lag2,ccfblue,ccf0,lagpk0,flip,fdot,nrobust) call xcor(i,nqsym,nsym,lag1,lag2,ccfblue,ccf0,lagpk0,flip,fdot,nrobust) ! Remove best-fit slope from ccfblue and normalize so baseline rms=1.0 if(.not.bVHF) call slope(ccfblue(lag1),lag2-lag1+1, & @@ -73,8 +69,6 @@ subroutine sync65(nfa,nfb,naggressive,ntol,nqsym,ca,ncand,nrobust, & endif endif if(itry.ne.0) then -! call xcor(ss,i,nqsym,nsym,lag1,lag2,ccfblue,ccf0,lagpk,flip,fdot, & -! nrobust) call xcor(i,nqsym,nsym,lag1,lag2,ccfblue,ccf0,lagpk,flip,fdot,nrobust) if(.not.bVHF) call slope(ccfblue(lag1),lag2-lag1+1, & lagpk-lag1+1.0) @@ -83,7 +77,6 @@ subroutine sync65(nfa,nfb,naggressive,ntol,nqsym,ca,ncand,nrobust, & call peakup(ccfblue(lagpk-1),ccfmax,ccfblue(lagpk+1),dx2) xlag=lagpk+dx2 endif -! dtx=xlag*2048.0/11025.0 dtx=xlag*1024.0/11025.0 ccfblue(lag1)=0. ccfblue(lag2)=0.