diff --git a/map65.py b/map65.py index 64cefb267..c95dcfe0e 100644 --- a/map65.py +++ b/map65.py @@ -1096,7 +1096,10 @@ def update(): bmtext.insert(END,'Freq DF Pol UTC\n') bmtext.insert(END,'----------------------------------------\n') for i in range(len(lines)): - nage=int(lines[i][41:]) + try: + nage=int(lines[i][41:]) + except: + nage=0 lines[i]=lines[i][:41] if nage==0: attr='age0' if nage==1: attr='age1' diff --git a/savetf2.F90 b/savetf2.F90 new file mode 100644 index 000000000..d2392fcc4 --- /dev/null +++ b/savetf2.F90 @@ -0,0 +1,50 @@ +subroutine savetf2(id,nsave,nutc) + parameter (NZ=60*96000) + parameter (NSPP=174) + parameter (NPKTS=NZ/NSPP) + integer*2 id(4,NZ) + real*4 ss(NPKTS),ss2(60) + real*8 dt,t,t2 + + dt=NSPP/96000.d0 + t=0.d0 + nh=nutc/100 + nm=mod(nutc,100) + t2=3600*nh + 60*nm + fac=1.0/(4.0*NSPP) + + do i=1,NPKTS + s=0. + do n=1,NSPP + s=s + float(id(1,i))**2 + float(id(2,i))**2 + float(id(3,i))**2 + & + float(id(4,i))**2 + enddo + ss(i)=fac*s + t=t+dt + t2=t2+dt + if(nsave.eq.3) write(24,1010) t,t2,ss(i) +1010 format(f6.6,f15.6,f10.3) + enddo + + if(nsave.eq.2) then + dt2=551*dt + t=0.d0 + t2=3600*nh + 60*nm + k=0 + do i=1,60 + s=0. + ns=0 + do n=1,551 + k=k+1 + s=s + ss(k) + if(ss(k).gt.0.0) ns=ns+1 + enddo + ss2(i)=s/ns + t=t+dt + t2=t2+dt2 + write(25,1010) t,t2,ss2(i) + enddo + endif + + return +end subroutine savetf2