From c374489cddd39053b6d14e35c01d5d681ae9bc79 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 29 Jun 2007 19:51:58 +0000 Subject: [PATCH] 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 --- datcom.f90 | 2 +- decode1.F90 | 11 +++++++++++ map65a.f90 | 6 +++--- recvpkt.F90 | 15 +++++++-------- symspec.f90 | 4 +--- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/datcom.f90 b/datcom.f90 index 5ea7b4df9..c09c0f726 100644 --- a/datcom.f90 +++ b/datcom.f90 @@ -2,4 +2,4 @@ parameter (NSMAX=60*96000) !Samples per 60 s file integer*2 id !46 MB: raw data from Linrad timf2 character*80 fname80 common/datcom/id(4,NSMAX,2),nutc,newdat2,kbuf,kk,kkdone,nlost, & - t00,nlen,fname80 + nlen,fname80 diff --git a/decode1.F90 b/decode1.F90 index 6b977ed54..55fb3afed 100644 --- a/decode1.F90 +++ b/decode1.F90 @@ -86,3 +86,14 @@ subroutine sleep_msec(n) return 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 diff --git a/map65a.f90 b/map65a.f90 index ad806036b..2a2b9ec59 100644 --- a/map65a.f90 +++ b/map65a.f90 @@ -23,7 +23,7 @@ subroutine map65a(newdat) data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/ save - print*,'C ',secnds(t00),nutc,kk,kbuf,kkdone + print*,'C ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym pctlost=nlost/331.03 if(nlost.ne.0) write(*,1001) nutc,nlost,pctlost 1001 format('UTC:',i5.4,' Lost packets:',i6,', or',f6.1,' %') @@ -227,7 +227,7 @@ subroutine map65a(newdat) write(11,*) '$EOF' call flushqqq(11) - print*,'D ',secnds(t00),nutc,kk,kbuf,kkdone + print*,'D ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym ndecdone=1 endif if(nagain.eq.1) go to 999 @@ -309,6 +309,6 @@ subroutine map65a(newdat) if(kbuf.eq.1) kkdone=60*96000 if(kbuf.eq.2) kkdone=0 kk=kkdone - print*,'E ',secnds(t00),nutc,kk,kbuf,kkdone + print*,'E ',mod(mid_sec(),60),nutc,kk,kbuf,kkdone,nhsym return end subroutine map65a diff --git a/recvpkt.F90 b/recvpkt.F90 index 9c12de0f3..adb5e97a7 100644 --- a/recvpkt.F90 +++ b/recvpkt.F90 @@ -107,18 +107,17 @@ subroutine recvpkt(iarg) ! kk=k ! kbuf=kb !### -! if(ns.eq.42) then -! nutc=mutc -! kbuf=kb -! kk=k -! t00=secnds(0.0) -! endif + if(ns.eq.48) then + nutc=mutc + kbuf=kb + kk=k + print*,'A1',mod(mid_sec(),60),nutc,kk,kbuf,kkdone + endif if(ns.eq.52) then nutc=mutc kbuf=kb kk=k - t00=secnds(0.0) - print*,'A ',0.0,nutc,kk,kbuf,kkdone + print*,'A2',mod(mid_sec(),60),nutc,kk,kbuf,kkdone endif endif diff --git a/symspec.f90 b/symspec.f90 index 7c79d2af4..29881f0e2 100644 --- a/symspec.f90 +++ b/symspec.f90 @@ -12,7 +12,7 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,t00,newdat) data kbuf0/-999/ 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)) hsym=2048.d0*96000.d0/11025.d0 !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 nhsym=n call sleep_msec(0) - write(81,3001) n,kbuf,kk,kkdone -3001 format(4i10) enddo 999 kkdone=i1-1