Bug fixes

Some minor issues found while testing

Author: demiangomez

CITATION.cff

@@ -5,6 +5,6 @@ authors:
   given-names: "Demián"
   orcid: "https://orcid.org/0000-0002-5276-581X"
 title: "Parallel.GAMIT"
-version: 1.0.0
+version: 1.2.2
 date-released: 2017-12-18
 url: "https://github.com/demiangomez/Parallel.GAMIT"

com/ApplyCountryCode.py

@@ -6,8 +6,8 @@
 
 This script assigns country codes to the stations table
 """
-from pgamit.classes import dbConnection
-from pgamit.classes import pyOptions
+from pgamit import dbConnection
+from pgamit import pyOptions
 import country_converter as coco
 
 from geopy.geocoders import Nominatim

com/PlotMapView.py

@@ -5,10 +5,7 @@
 Author: Demian D. Gomez
 """
 
-import pyETM
-import dbConnection
 import argparse
-import Utils
 import os
 import numpy as np
 from tqdm import tqdm
@@ -18,8 +15,11 @@
 
 # app
 from pgamit.pyETM import CO_SEISMIC_JUMP_DECAY, CO_SEISMIC_DECAY, LABEL
+from pgamit import Utils
 from pgamit.Utils import stationID
 from scipy.interpolate import griddata
+from pgamit import pyETM
+from pgamit import dbConnection
 
 
 def generate_kmz(kmz, stations):

com/SyncOrbits.py

@@ -170,8 +170,11 @@ def replace_vars(archive, date):
             # ##### now the brdc files #########
             folder = "/pub/gps/data/daily/%s/%s/%sn" % (date.yyyy(), date.ddd(), date.yyyy()[2:])
             tqdm.write(' -- Changing folder to ' + folder)
-            ftp.cwd(folder)
-            ftp_list = set(ftp.nlst())
+            try:
+                ftp.cwd(folder)
+                ftp_list = set(ftp.nlst())
+            except Exception:
+                ftp_list = ()
 
             brdc_archive = replace_vars(Config.brdc_path, date)
 
@@ -192,8 +195,11 @@ def replace_vars(archive, date):
             # ##### now the ionex files #########
             folder = "/pub/gps/products/ionex/%s/%s" % (date.yyyy(), date.ddd())
             tqdm.write(' -- Changing folder to ' + folder)
-            ftp.cwd(folder)
-            ftp_list = set(ftp.nlst())
+            try:
+                ftp.cwd(folder)
+                ftp_list = set(ftp.nlst())
+            except ftplib.error_perm:
+                ftp_list = ()
 
             ionex_archive = replace_vars(Config.ionex_path, date)
 

pgamit/pyPPP.py

@@ -268,16 +268,16 @@ def __init__(self, in_rinex, otl_coeff, options, sp3types, sp3altrn, antenna_hei
             try:
                 self.get_orbits(self.sp3types)
 
-            except (PyProducts.pySp3Exception,
-                    PyProducts.pyClkException,
-                    PyProducts.pyEOPException) as e:
+            except (pyProducts.pySp3Exception,
+                    pyProducts.pyClkException,
+                    pyProducts.pyEOPException) as e:
 
                 if sp3altrn:
                     self.get_orbits(self.sp3altrn)
                 else:
-                    raise type(e)(type(e)(e.message + ' -> This exception usually occurs due to the need of having '
-                                                      'the orbit for the day being processed and the orbit of the '
-                                                      'next day.'))
+                    raise type(e)(type(e)(str(e) + ' -> This exception usually occurs due to the need of having '
+                                                   'the orbit for the day being processed and the orbit of the '
+                                                   'next day.'))
 
             self.write_otl()
             self.copyfiles()

pgamit/pyRinex.py

@@ -968,7 +968,7 @@ def get_header(self):
 
     def auto_coord(self, brdc, chi_limit=3):
         # use NRCAN PPP in code-only mode to obtain a coordinate of the station
-        import pyPPP, pyOptions
+        from pgamit import pyPPP, pyOptions
 
         rnx = ReadRinex(self.NetworkCode, self.StationCode, self.rinex_path, allow_multiday=True)
 

setup.py

@@ -50,4 +50,10 @@
                    'com/TrajectoryFit.py',
                    'com/UpdateEarthquakes.py',
                    'com/WeeklyCombination.py',
-                   'com/Ztd2trp.py'])
+                   'com/Ztd2trp.py',
+                   # these are scripts that are outside dependencies but added for convenience
+                   'scripts/crz2rnx',
+                   'scripts/rnx2crz',
+                   'scripts/rename_crinex.sh',
+                   'scripts/rename_with_logs.sh',
+                   'scripts/rename_crinex2lower.sh'])