Added sanity checks to push_params in pyETM

Check for bad parameters during push parameters. Minor fix to igslog.py

Author: demiangomez

pgamit/igslog.py

@@ -15,6 +15,7 @@
     to: ((?:Nine\sCharacter\sID)|(?:Four\sCharacter\sID)|(?:Site\sID))
     (ps. probably same issue in the regex for igs format v2)
     It also needs to allow 'Nine Character ID' in v1
+DDG: no, changed back to (?:Nine\sCharacter\sID|Four\sCharacter\sID|Site\sID)\s+\:\s*(\w{4}).*\W+
     
 extract_id_block() inside:
     id_block = [id_block[1].decode().upper(), id_block[2].decode().upper()] = 
@@ -66,7 +67,7 @@
 
 _REGEX_ID_V1 = _re.compile(
     rb"""
-    ((?:Nine\sCharacter\sID)|(?:Four\sCharacter\sID)|(?:Site\sID))\s+\:\s*(\w{4}).*\W+
+    (?:Nine\sCharacter\sID|Four\sCharacter\sID|Site\sID)\s+\:\s*(\w{4}).*\W+
     .*\W+
     (?:\s{25}.+\W+|)
     IERS.+\:\s*(\w{9}|)

pgamit/pyETM.py

@@ -3230,9 +3230,22 @@ def push_params(self, cnn, params=None, reset_polynomial=False, reset_periodic=F
                         ('Year' not in params.keys() and 'DOY' in params.keys()):
                     raise pyETMException('Both parameters Year and DOY must be specified if either one is set')
 
+                # check that terms is an integer > 0
+                if type(params['terms']) is not int or params['terms'] <= 0:
+                    raise pyETMException('Parameter terms must be of type int > 0')
+
+                # check that the date is valid
+                if 'Year' in params.keys() and 'DOY' in params.keys():
+                    _ = pyDate.Date(year=params['Year'], doy=params['DOY'])
+
             elif params['object'] == 'periodic':
                 reset_periodic = True
 
+                # check that frequencies are not negative
+                for f in params['frequencies']:
+                    if f <= 0:
+                        raise pyETMException('Cannot insert negative frequencies for periodic components')
+
             # add the fields for station and network
             params['NetworkCode'] = self.NetworkCode
             params['StationCode'] = self.StationCode
@@ -3256,18 +3269,22 @@ def push_params(self, cnn, params=None, reset_polynomial=False, reset_periodic=F
         if params:
             if params['object'] == 'jump':
 
-                if params['jump_type'] > 0 and params['action'] == '+' and 'relaxation' not in params.keys():
-                    raise pyETMException('Relaxation parameter needed when jump_type>0 and action=+')
+                if params['action'] == '+' and params['jump_type'] > 0 and 'relaxation' not in params.keys():
+                    raise pyETMException('Relaxation parameters needed when jump_type > 0 and action = +')
+
+                if 'relaxation' in params.keys():
+                    for r in params['relaxation']:
+                        if r <= 0:
+                            raise pyETMException('Relaxation parameters must be > 0')
+
                 # query params to find the jump
                 qpar = copy.deepcopy(params)
                 qpar = {k: v for k, v in qpar.items() if k not in ('action', 'relaxation', 'jump_type')}
 
                 # remove existing parameters
                 cnn.delete('etm_params', **qpar)
 
-                if type(params['terms']) is not int:
-                    raise pyETMException('Parameter terms must be of type int')
-
+            # insert the parameters passed to the database
             cnn.insert('etm_params', **params)