From e03e64fdfe7c8cab53de885949aa9e3b8db233ef Mon Sep 17 00:00:00 2001 From: Cees Bassa Date: Tue, 20 Mar 2018 13:41:17 +0100 Subject: [PATCH 1/2] Write out sunset time --- acquire.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acquire.py b/acquire.py index e7c777b..1fc1ef7 100644 --- a/acquire.py +++ b/acquire.py @@ -163,7 +163,7 @@ if __name__ == '__main__': tend=trise elif (trise>=tset): dt=np.floor((tset-tnow).to(u.s).value) - print("The sun is above the horizon. Waiting %.0f seconds."%dt) + print("The sun is above the horizon. Sunset at %s.\nWaiting %.0f seconds."%(tset.isot,dt)) tend=trise try: time.sleep(dt) From 5306773ecdfdf4668f297b3ed4439e9168ff6320 Mon Sep 17 00:00:00 2001 From: Cees Bassa Date: Wed, 21 Mar 2018 18:20:40 +0100 Subject: [PATCH 2/2] Output fix --- extract_tracks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extract_tracks.py b/extract_tracks.py index 175e364..7b05442 100644 --- a/extract_tracks.py +++ b/extract_tracks.py @@ -305,11 +305,11 @@ def extract_tracks(fname,trkrmin,drdtmin,trksig,ntrkmin,path): print(iod_line) if id.catalog.find("classfd.tle")>0: - outfname="classfd.dat" + outfname=path+"/classfd/classfd.dat" elif id.catalog.find("inttles.tle")>0: - outfname="inttles.dat" + outfname=path+"/classfd/inttles.dat" else: - outfname="catalog.dat" + outfname=path+"/catalog/catalog.dat" f=open(outfname,"a") f.write("%s\n"%iod_line); @@ -325,7 +325,7 @@ def extract_tracks(fname,trkrmin,drdtmin,trksig,ntrkmin,path): ppgplot.pgmtxt("T",6.0,0.0,0.0,"UT Date: %.23s COSPAR ID: %04d"%(ff.nfd,ff.site_id)) ppgplot.pgmtxt("T",4.8,0.0,0.0,"R.A.: %10.5f (%4.1f'') Decl.: %10.5f (%4.1f'')"%(ff.crval[0],3600.0*ff.crres[0],ff.crval[1],3600.0*ff.crres[1])) ppgplot.pgmtxt("T",3.6,0.0,0.0,"FoV: %.2f\\(2218)x%.2f\\(2218) Scale: %.2f''x%.2f'' pix\\u-1\\d"%(ff.wx,ff.wy,3600.0*ff.sx,3600.0*ff.sy)) - ppgplot.pgmtxt("T",2.4,0.0,0.0,"Stat: %5.1f+-%.1f (%.1f-%.1f)"%(np.mean(ff.zmax),np.std(ff.zmax),ff.vmin,ff.vmax)) + ppgplot.pgmtxt("T",2.4,0.0,0.0,"Stat: %5.1f+-%.1f (%.1f-%.1f)"%(np.mean(ff.zmax),np.std(ff.zmax),ff.zmaxmin,ff.zmaxmax)) ppgplot.pgmtxt("T",0.3,0.0,0.0,iod_line) ppgplot.pgsch(1.0)