[bugfix] NLLoc: take nlloc bin explicitly from PylotParameter and not (randomly) from default pylot.in file!!

pylot/core/loc/nll.py

@@ -73,17 +73,14 @@ def modify_inputs(ctrfn, root, nllocoutn, phasefn, tttn):
     nllfile.close()
 
 
-def locate(fnin, infile=None):
+def locate(fnin, parameter=None):
     """
     takes an external program name and tries to run it
     :param fnin: external program name
     :return: None
     """
 
-    if infile is None:
-        exe_path = which('NLLoc')
-    else:
-        exe_path = which('NLLoc', infile)
+    exe_path = which('NLLoc', parameter)
     if exe_path is None:
         raise NLLocError('NonLinLoc executable not found; check your '
                          'environment variables')

pylot/core/util/utils.py

@@ -1094,7 +1094,7 @@ def runProgram(cmd, parameter=None):
     subprocess.check_output('{} | tee /dev/stderr'.format(cmd), shell=True)
 
 
-def which(program, infile=None):
+def which(program, parameter):
     """
     takes a program name and returns the full path to the executable or None
     modified after: http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
@@ -1109,16 +1109,9 @@ def which(program, infile=None):
         for key in settings.allKeys():
             if 'binPath' in key:
                 os.environ['PATH'] += ':{0}'.format(settings.value(key))
-        if infile is None:
-            # use default parameter-file name
-            bpath = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in')
-        else:
-            bpath = os.path.join(os.path.expanduser('~'), '.pylot', infile)
-
-        if os.path.exists(bpath):
-            nllocpath = ":" + PylotParameter(bpath).get('nllocbin')
-            os.environ['PATH'] += nllocpath
-    except ImportError as e:
+        nllocpath = ":" + parameter.get('nllocbin')
+        os.environ['PATH'] += nllocpath
+    except Exception as e:
         print(e.message)
 
     def is_exe(fpath):