Fix a flaw in ft8sim. De-activate the calls to plotspec() in foxfilt.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8317 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

lib/ft8/foxfilt.f90

@@ -1,4 +1,4 @@
-subroutine foxfilt(nslots,wave)
+subroutine foxfilt(nslots,width,wave)
 
   parameter (NN=79,ND=58,KK=87,NSPS=4*1920)
   parameter (NWAVE=NN*NSPS,NFFT=614400,NH=NFFT/2)
@@ -13,7 +13,6 @@ subroutine foxfilt(nslots,wave)
   df=48000.0/NFFT
   fa=1800.0 - 0.5*6.25
   fb=1800.0 + 7.5*6.25 + (nslots-1)*60.0
-  width=25.0
   ia2=nint(fa/df)
   ib1=nint(fb/df)
   ia1=nint(ia2-width/df)

lib/ft8/foxgen.f90

@@ -113,7 +113,7 @@ subroutine foxgen()
   
   peak1=maxval(abs(wave))
   wave=wave/peak1
-!  call plotspec(1,wave)          !Plot the spectrum
+  call plotspec(1,wave)          !Plot the spectrum
 
 ! Apply compression
 !  rms=sqrt(dot_product(wave,wave)/kz)
@@ -124,15 +124,26 @@ subroutine foxgen()
 !  peak2=maxval(abs(wave))
 !  wave=wave/peak2
   
-!  call plotspec(2,wave)          !Plot the spectrum
-  
-  call foxfilt(nslots,wave)
+  call plotspec(2,wave)          !Plot the spectrum
+
+  width=50.0
+  call foxfilt(nslots,width,wave)
   peak3=maxval(abs(wave))
   wave=wave/peak3
 
-!  call plotspec(3,wave)          !Plot the spectrum
+  nadd=1000
+  print*,nwave,nadd,nwave/nadd,peak3
+  j=0
+  do i=1,NWAVE,nadd
+     sx=dot_product(wave(i:i+nadd-1),wave(i:i+nadd-1))
+     j=j+1
+     write(30,3001) j,sx/nadd
+3001 format(i8,f12.6)
+  enddo
+
+  call plotspec(3,wave)          !Plot the spectrum
   
   return
 end subroutine foxgen
 
-!include 'plotspec.f90'
+include 'plotspec.f90'

lib/ft8/ft8sim.f90

@@ -70,7 +70,7 @@ program ft8sim
   txt=NN*NSPS/12000.0
 
 ! Source-encode, then get itone()
-  if(index(msg32,';').lt.0) then
+  if(index(msg32,';').le.0) then
      i3bit=0
      msg=msg32(1:22)
      call genft8(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone)