Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
finesse
pykat
Commits
fcdb904f
Commit
fcdb904f
authored
Mar 25, 2014
by
Daniel Brown
Browse files
Merge branch 'master' of gitmaster.atlas.aei.uni-hannover.de:pykat/pykat
Conflicts: pykat/finesse.py
parents
ac6d7549
a76f88c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
pykat/finesse.py
View file @
fcdb904f
...
@@ -753,7 +753,7 @@ class kat(object):
...
@@ -753,7 +753,7 @@ class kat(object):
return
Process
(
target
=
f__lkat_process
,
args
=
(
callback
,
cmd
,
kwargs
))
return
Process
(
target
=
f__lkat_process
,
args
=
(
callback
,
cmd
,
kwargs
))
def
run
(
self
,
printout
=
0
,
printerr
=
0
,
save_output
=
False
,
save_kat
=
False
,
kat_name
=
None
)
:
def
run
(
self
,
printout
=
0
,
printerr
=
0
,
plot
=
None
,
save_output
=
False
,
save_kat
=
False
,
kat_name
=
None
)
:
"""
"""
Runs the current simulation setup that has been built thus far.
Runs the current simulation setup that has been built thus far.
It returns a katRun or katRun2D object which is populated with the various
It returns a katRun or katRun2D object which is populated with the various
...
@@ -800,6 +800,14 @@ class kat(object):
...
@@ -800,6 +800,14 @@ class kat(object):
r
.
yaxis
=
self
.
yaxis
r
.
yaxis
=
self
.
yaxis
r
.
katScript
=
""
.
join
(
self
.
generateKatScript
())
r
.
katScript
=
""
.
join
(
self
.
generateKatScript
())
if
(
plot
==
None
):
# ensure we don't do any plotting. That should be handled
# by user themselves
r
.
katScript
+=
(
"gnuterm no
\n
"
)
r
.
katScript
+=
(
"pyterm no
\n
"
)
else
:
r
.
katScript
+=
(
plot
+
"
\n
"
)
# create a kat file which we will write the script into
# create a kat file which we will write the script into
if
self
.
__tempname
==
None
:
if
self
.
__tempname
==
None
:
...
@@ -811,7 +819,7 @@ class kat(object):
...
@@ -811,7 +819,7 @@ class kat(object):
katfile
.
writelines
(
r
.
katScript
)
katfile
.
writelines
(
r
.
katScript
)
katfile
.
flush
()
katfile
.
flush
()
if
printout
==
1
:
if
printout
==
1
or
plot
!=
None
:
cmd
=
[
kat_exec
]
cmd
=
[
kat_exec
]
else
:
else
:
cmd
=
[
kat_exec
,
'--perl1'
]
cmd
=
[
kat_exec
,
'--perl1'
]
...
@@ -1161,6 +1169,7 @@ class kat(object):
...
@@ -1161,6 +1169,7 @@ class kat(object):
if
self
.
noxaxis
==
True
:
if
self
.
noxaxis
==
True
:
out
.
append
(
"noxaxis
\n
"
)
out
.
append
(
"noxaxis
\n
"
)
<<<<<<<
HEAD
if
self
.
yaxis
!=
None
:
if
self
.
yaxis
!=
None
:
out
.
append
(
"yaxis {0}
\n
"
.
format
(
self
.
yaxis
))
out
.
append
(
"yaxis {0}
\n
"
.
format
(
self
.
yaxis
))
...
@@ -1169,6 +1178,8 @@ class kat(object):
...
@@ -1169,6 +1178,8 @@ class kat(object):
# by user themselves
# by user themselves
out
.
append
(
"gnuterm no
\n
"
)
out
.
append
(
"gnuterm no
\n
"
)
out
.
append
(
"pyterm no
\n
"
)
out
.
append
(
"pyterm no
\n
"
)
=======
>>>>>>>
a76f88c16370e3db396376d1b684d24aa7f00c89
return
out
return
out
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment