From f92be26c93a4c51ba9ecec2ba32cf05ceaa3a253 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 12 Nov 2007 14:55:30 +0000 Subject: [PATCH] Another try at using median (actually 45%-ile) for base level in waterfall. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@577 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- map65.py | 2 +- spec.f90 | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/map65.py b/map65.py index b54e1d2d0..75985275a 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#---------------------------------------------------------------------- MAP65 +#--------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import * diff --git a/spec.f90 b/spec.f90 index af56dfe12..1e9477c05 100644 --- a/spec.f90 +++ b/spec.f90 @@ -17,7 +17,7 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) ! Could save memory by doing the averaging-by-7 (or 10?) of ss5 in symspec. include 'spcom.f90' - real s(NFFT,NY) + real s(NFFT,NY),savg2(NFFT),tmp(NFFT) include 'gcom1.f90' include 'gcom2.f90' include 'gcom3.f90' @@ -45,6 +45,15 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) enddo enddo enddo + call zero(savg2,NFFT) + do j=1,nlines + call add(savg2,s(1,j),savg2,NFFT) + enddo + + ia=0.08*NFFT + nn=0.84*NFFT + call pctile(savg2(ia),tmp,nn,45,base) + base=base/nlines newpts=NX*nlines do i=newpts+1,NX*NY @@ -55,7 +64,7 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) gain=40*sqrt(nstep(nspeed)/5.0) * 5.0**(0.01*contrast) gamma=1.3 + 0.01*contrast offset=(brightness+64.0)/2 - fac=20.0/nadd + fac=3.2/base foffset=0.001*(1270+nfcal) nbpp=(nfb-nfa)*NFFT/(96.0*NX) !Bins per pixel in wideband (upper) waterfall fselect=mousefqso + foffset @@ -73,7 +82,6 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) do j=nlines,1,-1 !Reverse order so last will be on top do i=1,NX k=k+1 - n=0 x=0. iia=(i-1)*nbpp + ii0 + 1