w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-25 05:29:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Log scale in waterfalls.

Browse Source 
Remove rfile2.
Remove call to hrtime.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@607 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-12-28 17:33:18 +00:00
parent a9fc41b0ee
commit 5e4fb0f31e
6 changed files with 25 additions and 37 deletions

2
astro.F
View File

@ -37,8 +37,6 @@ C NB: may want to smooth the Tsky map to 10 degrees or so.
open(13,file=fname,status='old',access='stream',err=10)
read(13) nsky
close(13)
! call rfile2(fname,nsky,129600,nr)
! if(nr.ne.129600) go to 10
#endif
ltsky=.true.
first=.false.

12
getfile2.F90
View File

@ -33,22 +33,12 @@ subroutine getfile2(fname,len)
ndecoding=4
monitoring=0
kbuf=1
!#ifdef CVF
! open(10,file=fname,form='binary',status='old',err=998)
call rfile3a(fname,id,n,ierr)
if(ierr.ne.0) then
print*,'Error opening or reading file: ',fname,ierr
go to 999
endif
!#else
! call rfile2(fname,id,n,nr)
! if(nr.ne.n) then
! print*,'Error opening or reading file: ',fname,n,nr
! ierr=1002
! go to 999
! endif
!
!#endif
sq=0.
ka=0.1*NSMAX

2
map65.py
View File

@ -1,4 +1,4 @@
#--------------------------------------------------------------------- MAP65
#-------------------------------------------------------------------- MAP65
# $Date$ $Revision$
#
from Tkinter import *

9
sec_midn.F90
View File

@ -1,14 +1,5 @@
real function sec_midn()
real*8 sec8,hrtime
#ifdef CVF
sec_midn=secnds(0.0)
#else
sec8=hrtime()
sec_midn=mod(sec8,86400.d0)
#endif
return
end function sec_midn

12
spec.f90
View File

@ -89,9 +89,13 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2)
a2(i)=a2(i-newpts)
enddo
gain=40*sqrt(nstep(nspeed)/5.0) * 5.0**(0.01*contrast)
logmap=1
gamma=1.3 + 0.01*contrast
offset=(brightness+64.0)/2
if(logmap.eq.1) then
gain=40*sqrt(nstep(nspeed)/5.0) * 5.0**(0.01*contrast)
offset=brightness/2 + 10
endif
fac=20.0/nadd
fac=fac*0.065/base
! fac=fac*(0.1537/base)
@ -120,14 +124,16 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2)
x=max(x,s(ii,j))
enddo
x=fac*x
if(x.gt.0.0) n=(2.0*x)**gamma + offset
if(x.gt.0.0 .and. logmap.eq.0) n=(2.0*x)**gamma + offset
if(x.gt.0.0 .and. logmap.eq.1) n=gain*log10(1.0*x) + offset
n=min(252,max(0,n))
a(k)=n
! Now do the lower (zoomed) waterfall with one FFT bin per pixel.
n=0
x=fac*s(i0+i-1,j)
if(x.gt.0.0) n=(3.0*x)**gamma + offset
if(x.gt.0.0 .and. logmap.eq.0) n=(3.0*x)**gamma + offset
if(x.gt.0.0 .and. logmap.eq.1) n=1.2*gain*log10(1.0*x) + offset
n=min(252,max(0,n))
a2(k)=n

25
wsjtgen.F90
View File

@ -64,6 +64,9 @@ subroutine wsjtgen
testfile=msg(2:)
#ifdef CVF
open(18,file=testfile,form='binary',status='old',err=12)
#else
open(18,file=testfile,access='stream',status='old',err=12)
#endif
go to 14
12 print*,'Cannot open test file ',msg(2:)
go to 999
@ -73,17 +76,17 @@ subroutine wsjtgen
close(18)
if(ierr.ne.0) print*,'Error reading test file ',msg(2:)
#else
tfile2=testfile
call rfile2(tfile2,hdr,44+2*661500,nr)
if(nr.le.0) then
print*,'Error reading ',testfile
stop
endif
do i=1,ndata/2
iwave(i)=jwave(i)
enddo
#endif
!#else
! tfile2=testfile
! call rfile2(tfile2,hdr,44+2*661500,nr)
! if(nr.le.0) then
! print*,'Error reading ',testfile
! stop
! endif
! do i=1,ndata/2
! iwave(i)=jwave(i)
! enddo
!#endif
nwave=ndata/2
do i=nwave,NTXMAX
iwave(i)=0