mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-29 23:58:39 -05:00
Running OK with FFTs starting at t=48. Several diagnostic prints ...)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@441 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
5d19491dd8
commit
c374489cdd
@ -2,4 +2,4 @@ parameter (NSMAX=60*96000) !Samples per 60 s file
|
|||||||
integer*2 id !46 MB: raw data from Linrad timf2
|
integer*2 id !46 MB: raw data from Linrad timf2
|
||||||
character*80 fname80
|
character*80 fname80
|
||||||
common/datcom/id(4,NSMAX,2),nutc,newdat2,kbuf,kk,kkdone,nlost, &
|
common/datcom/id(4,NSMAX,2),nutc,newdat2,kbuf,kk,kkdone,nlost, &
|
||||||
t00,nlen,fname80
|
nlen,fname80
|
||||||
|
11
decode1.F90
11
decode1.F90
@ -86,3 +86,14 @@ subroutine sleep_msec(n)
|
|||||||
return
|
return
|
||||||
end subroutine sleep_msec
|
end subroutine sleep_msec
|
||||||
|
|
||||||
|
integer function mid_sec()
|
||||||
|
integer time
|
||||||
|
|
||||||
|
#ifdef Win32
|
||||||
|
mid_sec=int(secnds(0.0))
|
||||||
|
#else
|
||||||
|
mid_sec=mod(time(),86400)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return
|
||||||
|
end function mid_sec
|
||||||
|
@ -23,7 +23,7 @@ subroutine map65a(newdat)
|
|||||||
data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/
|
data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/
|
||||||
save
|
save
|
||||||
|
|
||||||
print*,'C ',secnds(t00),nutc,kk,kbuf,kkdone
|
print*,'C ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym
|
||||||
pctlost=nlost/331.03
|
pctlost=nlost/331.03
|
||||||
if(nlost.ne.0) write(*,1001) nutc,nlost,pctlost
|
if(nlost.ne.0) write(*,1001) nutc,nlost,pctlost
|
||||||
1001 format('UTC:',i5.4,' Lost packets:',i6,', or',f6.1,' %')
|
1001 format('UTC:',i5.4,' Lost packets:',i6,', or',f6.1,' %')
|
||||||
@ -227,7 +227,7 @@ subroutine map65a(newdat)
|
|||||||
|
|
||||||
write(11,*) '$EOF'
|
write(11,*) '$EOF'
|
||||||
call flushqqq(11)
|
call flushqqq(11)
|
||||||
print*,'D ',secnds(t00),nutc,kk,kbuf,kkdone
|
print*,'D ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym
|
||||||
ndecdone=1
|
ndecdone=1
|
||||||
endif
|
endif
|
||||||
if(nagain.eq.1) go to 999
|
if(nagain.eq.1) go to 999
|
||||||
@ -309,6 +309,6 @@ subroutine map65a(newdat)
|
|||||||
if(kbuf.eq.1) kkdone=60*96000
|
if(kbuf.eq.1) kkdone=60*96000
|
||||||
if(kbuf.eq.2) kkdone=0
|
if(kbuf.eq.2) kkdone=0
|
||||||
kk=kkdone
|
kk=kkdone
|
||||||
print*,'E ',secnds(t00),nutc,kk,kbuf,kkdone
|
print*,'E ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym
|
||||||
return
|
return
|
||||||
end subroutine map65a
|
end subroutine map65a
|
||||||
|
15
recvpkt.F90
15
recvpkt.F90
@ -107,18 +107,17 @@ subroutine recvpkt(iarg)
|
|||||||
! kk=k
|
! kk=k
|
||||||
! kbuf=kb
|
! kbuf=kb
|
||||||
!###
|
!###
|
||||||
! if(ns.eq.42) then
|
if(ns.eq.48) then
|
||||||
! nutc=mutc
|
nutc=mutc
|
||||||
! kbuf=kb
|
kbuf=kb
|
||||||
! kk=k
|
kk=k
|
||||||
! t00=secnds(0.0)
|
print*,'A1',mod(mid_sec(),60),nutc,kk,kbuf,kkdone
|
||||||
! endif
|
endif
|
||||||
if(ns.eq.52) then
|
if(ns.eq.52) then
|
||||||
nutc=mutc
|
nutc=mutc
|
||||||
kbuf=kb
|
kbuf=kb
|
||||||
kk=k
|
kk=k
|
||||||
t00=secnds(0.0)
|
print*,'A2',mod(mid_sec(),60),nutc,kk,kbuf,kkdone
|
||||||
print*,'A ',0.0,nutc,kk,kbuf,kkdone
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
|
|||||||
data kbuf0/-999/
|
data kbuf0/-999/
|
||||||
save
|
save
|
||||||
|
|
||||||
print*,'B ',secnds(t00),0,kk,kbuf,kkdone
|
print*,'B ',mod(mid_sec(),60),0,kk,kbuf,kkdone
|
||||||
fac=0.0002 * 10.0**(0.05*(-rxnoise))
|
fac=0.0002 * 10.0**(0.05*(-rxnoise))
|
||||||
hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
|
hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
|
||||||
npts=hsym !Integral samples per half symbol
|
npts=hsym !Integral samples per half symbol
|
||||||
@ -105,8 +105,6 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
|
|||||||
kkdone=i1-1
|
kkdone=i1-1
|
||||||
nhsym=n
|
nhsym=n
|
||||||
call sleep_msec(0)
|
call sleep_msec(0)
|
||||||
write(81,3001) n,kbuf,kk,kkdone
|
|
||||||
3001 format(4i10)
|
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
999 kkdone=i1-1
|
999 kkdone=i1-1
|
||||||
|
Loading…
Reference in New Issue
Block a user