Skip to content
Snippets Groups Projects
Commit abfe66ca authored by Daniel Brown's avatar Daniel Brown
Browse files

Merge branch 'master' of gitmaster.atlas.aei.uni-hannover.de:pykat/pykat

parent f50480ef
No related branches found
No related tags found
No related merge requests found
...@@ -99,7 +99,7 @@ class Component(object): ...@@ -99,7 +99,7 @@ class Component(object):
cnew = type(cnew_name, (cls,), {}) cnew = type(cnew_name, (cls,), {})
return object.__new__(cnew, *args, **kwargs) return object.__new__(cnew)
def __init__(self, name=None): def __init__(self, name=None):
......
...@@ -51,7 +51,7 @@ class BaseDetector(object) : ...@@ -51,7 +51,7 @@ class BaseDetector(object) :
cnew = type(cnew_name, (cls,), {}) cnew = type(cnew_name, (cls,), {})
return object.__new__(cnew, *args, **kwargs) return object.__new__(cnew)
def __init__(self, name, nodes=None, max_nodes=1): def __init__(self, name, nodes=None, max_nodes=1):
...@@ -394,7 +394,7 @@ class pd(Detector1): ...@@ -394,7 +394,7 @@ class pd(Detector1):
cnew = type(cnew_name, (cls,), {}) cnew = type(cnew_name, (cls,), {})
return object.__new__(cnew, *args, **kwargs) return object.__new__(cnew)
def __deepcopy__(self, memo): def __deepcopy__(self, memo):
""" """
......
...@@ -433,7 +433,7 @@ class kat(object): ...@@ -433,7 +433,7 @@ class kat(object):
global id___ global id___
id___ += 1 id___ += 1
cnew = type(pykat.finesse.kat.__name__ + str("_") + str(id___), (pykat.finesse.kat,), {}) cnew = type(pykat.finesse.kat.__name__ + str("_") + str(id___), (pykat.finesse.kat,), {})
return object.__new__(cnew, *args, **kwargs) return object.__new__(cnew)
def __init__(self, kat_file=None, kat_code=None, katdir="", katname="", tempdir=None, tempname=None): def __init__(self, kat_file=None, kat_code=None, katdir="", katname="", tempdir=None, tempname=None):
self.scene = None # scene object for GUI self.scene = None # scene object for GUI
...@@ -1119,7 +1119,7 @@ class kat(object): ...@@ -1119,7 +1119,7 @@ class kat(object):
[out,errpipe] = p.communicate() [out,errpipe] = p.communicate()
_out = out.split("\n") _out = str(out).split("\n")
for line in _out[::-1]: for line in _out[::-1]:
if line.lstrip().startswith('computation time:'): if line.lstrip().startswith('computation time:'):
......
...@@ -36,7 +36,8 @@ class NodeNetwork(object): ...@@ -36,7 +36,8 @@ class NodeNetwork(object):
cnew = type(cnew_name, (cls,), {}) cnew = type(cnew_name, (cls,), {})
return object.__new__(cnew, *args, **kwargs) #return object.__new__(cnew, *args, **kwargs)
return object.__new__(cnew)
def __init__(self, kat): def __init__(self, kat):
self.__nodes = {} self.__nodes = {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment