From b7a625d3a0b599ad73d7d845e4fd994020748dfa Mon Sep 17 00:00:00 2001 From: kristinemlarson <kristinem.larson@gmail.com> Date: Wed, 11 Sep 2024 16:43:32 -0700 Subject: [PATCH] removed some dead functions from highrate (allowing archive=all) --- gnssrefl/karnak_libraries.py | 10 ++++++---- gnssrefl/rinex2snr.py | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gnssrefl/karnak_libraries.py b/gnssrefl/karnak_libraries.py index 30c28d7d3..40e7d82cd 100644 --- a/gnssrefl/karnak_libraries.py +++ b/gnssrefl/karnak_libraries.py @@ -671,6 +671,8 @@ def rinex2_highrate(station, year, doy,archive,strip_snr): strip_snr is boolean as to whether you want to strip out the non-SNR data it can be slow with highrate data. it requires gfzrnx + this no longer allows the all archive ... which should have been stopped at rinex2snr_cl + Parameters ---------- station : string @@ -693,15 +695,15 @@ def rinex2_highrate(station, year, doy,archive,strip_snr): d = g.doy2ymd(year,doy); month = d.month; day = d.day rinexfile,rinexfiled = g.rinex_name(station, year, month, day) - if (archive == 'unavco') or (archive == 'all'): + if (archive == 'unavco') : g.rinex_unavco_highrate(station, year, month, day) # file does not exist, so keep looking if not os.path.isfile(rinexfile): - if (archive == 'nrcan') or (archive == 'all'): + if (archive == 'nrcan') : g.rinex_nrcan_highrate(station, year, month, day) - # try new cddis for highrate rINex 2 + # try new cddis for highrate rinex 2 if not os.path.isfile(rinexfile): - if (archive == 'cddis') or (archive == 'all'): + if (archive == 'cddis') : stream = 'R' srate = 1 # one second ch.cddis_highrate(station, year, month, day,stream,srate) diff --git a/gnssrefl/rinex2snr.py b/gnssrefl/rinex2snr.py index be8b93727..2a12b3480 100755 --- a/gnssrefl/rinex2snr.py +++ b/gnssrefl/rinex2snr.py @@ -463,7 +463,7 @@ def conv2snr(year, doy, station, option, orbtype,receiverrate,dec_rate,archive,t # further down code wnats it called rinexfile ... so let's play along rinexfile = r2_filename else: - print('In principle the RINEX 2.11 file does not yet exist : ', r2_filename) + print('the RINEX 2.11 file does not yet exist, so will look for it') if receiverrate == 'high': strip_snr = False # for now - file_name, foundit = k.rinex2_highrate(station, year, doy,archive,strip_snr) @@ -520,7 +520,7 @@ def conv2snr(year, doy, station, option, orbtype,receiverrate,dec_rate,archive,t in6 = g.binary(errorlog) log.write('SNR file {0:50s} \n will use hybrid of python and fortran to make \n'.format( snrname)) - # these are calls to the fortran codes that have been ported to be called from python + # these are calls to the fortran codes that are called from python if (orbtype == 'gps') or ('nav' in orbtype): gpssnr.foo(in1,in2,in3,in4,in5,in6) else: @@ -549,6 +549,7 @@ def conv2snr(year, doy, station, option, orbtype,receiverrate,dec_rate,archive,t log.write('SNR file {0:50s} \n will use python to make \n'.format( snrname)) log.write('Decimating will be done here instead of using teqc \n') t1=time.time() + # i think this uses the strandberg way rnx2snr(rinexfile, orbfile,snrname,option,year,month,day,dec_rate,log) t2=time.time()