version 3.1.2

kristinemlarson · Mar 20, 2024 · 5be62d5 · 5be62d5
1 parent 56aea65
commit 5be62d5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## 3.1.2
+
 Fixed bugs in highrate RINEX 3 downloads/translations that conflicted with parallel processing
 (GA and BKG archives). This was mostly related to how I stored interim Rinex 2 files.
 
-added ultra rapid orbits to nmea code
-
+Restored csv outputs to subdaily module. 
 
 ## 3.1.1
 nmea2snr checks rapid, final, and ultra GNSS orbits from GFZ.

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# gnssrefl v3.1.1 
+# gnssrefl v3.1.2 
 
 [![PyPI Version](https://img.shields.io/pypi/v/gnssrefl.svg)](https://pypi.python.org/pypi/gnssrefl) 
 

diff --git a/gnssrefl/subdaily.py b/gnssrefl/subdaily.py
@@ -534,17 +534,17 @@ def write_out_header(fout,station,extraline,**kwargs):
     fout.write('% Traditional phase center corrections have NOT been applied \n')
     if extra_columns:
         fout.write("% (1)  (2)   (3) (4)  (5)     (6)   (7)    (8)    (9)   (10)  (11) (12) (13)    (14)     (15)    (16) (17) (18,19,20,21,22)    (23)        (24) \n")
-        fout.write("% year, doy, RH, sat,UTCtime, Azim, Amp,  eminO, emaxO,NumbOf,freq,rise,EdotF, PkNoise  DelT     MJD  refr  MM DD HH MM SS   RH with      RHdot \n")
+        fout.write("% year, doy, RH, sat,UTCtime, Azim, Amp,  eminO, emaxO,NumbOf,freq,rise,EdotF, PkNoise, DelT,    MJD, refr, MM,DD,HH,MM,SS,  RH with,     RHdot \n")
         fout.write("%             m       hours   deg   v/v    deg   deg                1/-1       ratio    minute        1/0                    RHdotCorr    Corr m    \n")
     else:
         if IFcol:
             fout.write('% Reflector heights set to the L1-phase center are in column 25 \n')
             fout.write("% (1)  (2)   (3) (4)  (5)     (6)   (7)    (8)    (9)   (10)  (11) (12) (13)    (14)     (15)    (16) (17) (18,19,20,21,22)   (23)      (24)    (25)\n")
-            fout.write("% year, doy, RH, sat,UTCtime, Azim, Amp,  eminO, emaxO,NumbOf,freq,rise,EdotF, PkNoise  DelT     MJD  refr  MM DD HH MM SS  RH with    RHdot     RH with  \n")
+            fout.write("% year, doy, RH, sat,UTCtime, Azim, Amp,  eminO, emaxO,NumbOf,freq,rise,EdotF, PkNoise, DelT,    MJD, refr, MM,DD,HH,MM,SS, RH with,   RHdot,    RH with  \n")
             fout.write("%             m       hours   deg   v/v    deg   deg                1/-1       ratio    minute        1/0                   RHdotCorr  Corr m    IF Corr  m  \n")
         else:
             fout.write("% (1)  (2)   (3) (4)  (5)     (6)   (7)    (8)    (9)   (10)  (11) (12) (13)    (14)     (15)    (16) (17) (18,19,20,21,22)\n")
-            fout.write("% year, doy, RH, sat,UTCtime, Azim, Amp,  eminO, emaxO,NumbOf,freq,rise,EdotF, PkNoise  DelT     MJD  refr  MM DD HH MM SS \n")
+            fout.write("% year, doy, RH, sat,UTCtime, Azim, Amp,  eminO, emaxO,NumbOf,freq,rise,EdotF, PkNoise, DelT,    MJD, refr, MM,DD,HH,MM,SS \n")
             fout.write("%             m       hours   deg   v/v    deg   deg                1/-1       ratio    minute        1/0                  \n")
 
 
@@ -814,7 +814,6 @@ def rhdot_correction2(station,fname,fname_new,pltit,outlierV,outlierV2,**kwargs)
         apply_if_corr = False
 
     writecsv = kwargs.get('csv',False)
-    # i will merge these two in a bit
 
 
     apply_rhdot  = kwargs.get('apply_rhdot',True)
@@ -833,7 +832,6 @@ def rhdot_correction2(station,fname,fname_new,pltit,outlierV,outlierV2,**kwargs)
 
     fs = kwargs.get('fs',12)
 
-    #print('output directory: ', txtdir)
 
 #   how often do you want velocity computed (per day)
     perday = 24*20 # so every 3 minutes

diff --git a/gnssrefl/subdaily_cl.py b/gnssrefl/subdaily_cl.py
@@ -19,7 +19,7 @@ def parse_arguments():
     parser.add_argument("-year_end", default=None, type=int, help="Allow multiple years of inputs by specifying last year")
     parser.add_argument("-txtfile_part1", default=None, type=str, help="optional filename (part1), must be in gnssir output format") 
     parser.add_argument("-txtfile_part2", default=None, type=str, help="optional filename (part2), must be gnssir output format ") 
-    parser.add_argument("-csv", default=None, type=str, help="set to True if you prefer csv to plain txt")
+    parser.add_argument("-csv", default=None, type=str, help="set to True if you prefer csv to plain txt output")
     parser.add_argument("-plt", default=None, type=str, help="set to False to suppress plots")
     parser.add_argument("-spline_outlier1", default=None, type=float, help="outlier criterion used in first splinefit (meters)")
     parser.add_argument("-spline_outlier2", default=None, type=float, help="outlier criterion used in second splinefit (meters)")
@@ -40,7 +40,7 @@ def parse_arguments():
     parser.add_argument("-subdir", default=None, type=str, help="non-default subdirectory for output")
     parser.add_argument("-delta_out", default=None, type=int, help="Output interval for final spline fit, seconds (default is 1800)")
     parser.add_argument("-if_corr", default=None, type=str, help="Whether interfrequency correction is applied, optional")
-    parser.add_argument("-knots_test", default=None, type=int, help="test knots")
+    parser.add_argument("-knots_test", default=None, type=int, help="test knots, kristine only")
     parser.add_argument("-hires_figs", default=None, type=str, help="hi-resolution eps figures, default is False")
     parser.add_argument("-apply_rhdot", default=None, type=str, help="apply rhdot, default is True")
     parser.add_argument("-fs", default=None, type=int, help="fontsize for figures. default is 10")

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
 ]
 setup(
     name="gnssrefl",
-    version="3.1.1",
+    version="3.1.2",
     author="Kristine Larson",
     author_email="[email protected]",
     description="A GNSS reflectometry software package ",