Merge branch 'master' of gitlab.aei.uni-hannover.de:finesse/pykat

pykat/finesse.py

@@ -1765,6 +1765,16 @@ class kat(object):
             
             k = r.stdout.rfind('computation time:')
             
+            if usePipe == False:
+                # Set version if not using pipe information
+                s = r.stdout.find('(build ') + 7
+                e = r.stdout[s:].find(')')
+                
+                if s == -1 or e == -1:
+                    r.katVersion = "Couldn't get version number"
+                else:
+                    r.katVersion = r.stdout[s:(s+e)]
+                
             if k > 0:
                 try:
                     line = r.stdout[k:]
@@ -1831,7 +1841,7 @@ class kat(object):
                                         traceData[-1][node_name] = (pykat.BeamParam(q=complex(qx), wavelength=self.lambda0),
                                                                     pykat.BeamParam(q=complex(qy), wavelength=self.lambda0),
                                                                     component_name)
-                                        direc = a[1].split(";")[-1].strip().split(maxsplit=1)[-1]
+                                        direc = a[1].split(";")[-1].strip().split(None, 1)[-1]
                                         
                                         traceData[-1][node_name][0].direction = direc
                                         traceData[-1][node_name][1].direction = direc