Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
a2453d02
Commit
a2453d02
authored
9 years ago
by
Elliot Oram
Browse files
Options
Downloads
Patches
Plain Diff
lower case on variable names
Refs #13826
parent
b437cfbf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/QLRun.py
+16
-16
16 additions, 16 deletions
...nInterface/plugins/algorithms/WorkflowAlgorithms/QLRun.py
with
16 additions
and
16 deletions
Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/QLRun.py
+
16
−
16
View file @
a2453d02
...
@@ -23,9 +23,9 @@ class QLRun(PythonAlgorithm):
...
@@ -23,9 +23,9 @@ class QLRun(PythonAlgorithm):
_width
=
None
_width
=
None
_res_norm
=
None
_res_norm
=
None
_wfile
=
None
_wfile
=
None
_
L
oop
=
None
_
l
oop
=
None
_
S
ave
=
None
_
s
ave
=
None
_
P
lot
=
None
_
p
lot
=
None
def
category
(
self
):
def
category
(
self
):
return
"
Workflow
\\
MIDAS;PythonAlgorithms
"
return
"
Workflow
\\
MIDAS;PythonAlgorithms
"
...
@@ -122,9 +122,9 @@ class QLRun(PythonAlgorithm):
...
@@ -122,9 +122,9 @@ class QLRun(PythonAlgorithm):
self
.
_width
=
self
.
getProperty
(
'
FixedWidth
'
).
value
self
.
_width
=
self
.
getProperty
(
'
FixedWidth
'
).
value
self
.
_res_norm
=
self
.
getProperty
(
'
UseResNorm
'
).
value
self
.
_res_norm
=
self
.
getProperty
(
'
UseResNorm
'
).
value
self
.
_wfile
=
self
.
getPropertyValue
(
'
WidthFile
'
)
self
.
_wfile
=
self
.
getPropertyValue
(
'
WidthFile
'
)
self
.
_
L
oop
=
self
.
getProperty
(
'
Loop
'
).
value
self
.
_
l
oop
=
self
.
getProperty
(
'
Loop
'
).
value
self
.
_
S
ave
=
self
.
getProperty
(
'
Save
'
).
value
self
.
_
s
ave
=
self
.
getProperty
(
'
Save
'
).
value
self
.
_
P
lot
=
self
.
getPropertyValue
(
'
Plot
'
)
self
.
_
p
lot
=
self
.
getPropertyValue
(
'
Plot
'
)
def
PyExec
(
self
):
def
PyExec
(
self
):
...
@@ -132,11 +132,11 @@ class QLRun(PythonAlgorithm):
...
@@ -132,11 +132,11 @@ class QLRun(PythonAlgorithm):
run_f2py_compatibility_test
()
run_f2py_compatibility_test
()
from
IndirectBayes
import
(
CalcErange
,
GetXYE
,
ReadNormFile
,
\
from
IndirectBayes
import
(
CalcErange
,
GetXYE
,
ReadNormFile
,
ReadWidthFile
,
QLAddSampleLogs
,
C2Fw
,
\
ReadWidthFile
,
QLAddSampleLogs
,
C2Fw
,
C2Se
,
QuasiPlot
)
C2Se
,
QuasiPlot
)
from
IndirectCommon
import
(
getDefaultWorkingDirectory
,
CheckXrange
,
\
from
IndirectCommon
import
(
getDefaultWorkingDirectory
,
CheckXrange
,
CheckAnalysers
,
getEfixed
,
GetThetaQ
,
\
CheckAnalysers
,
getEfixed
,
GetThetaQ
,
CheckHistZero
,
CheckHistSame
)
CheckHistZero
,
CheckHistSame
)
self
.
log
().
information
(
'
QLRun input
'
)
self
.
log
().
information
(
'
QLRun input
'
)
...
@@ -178,7 +178,7 @@ class QLRun(PythonAlgorithm):
...
@@ -178,7 +178,7 @@ class QLRun(PythonAlgorithm):
totalNoSam
=
nsam
totalNoSam
=
nsam
#check if we're performing a sequential fit
#check if we're performing a sequential fit
if
self
.
_
L
oop
!=
True
:
if
self
.
_
l
oop
!=
True
:
nsam
=
1
nsam
=
1
nres
=
CheckHistZero
(
self
.
_resWS
)[
0
]
nres
=
CheckHistZero
(
self
.
_resWS
)[
0
]
...
@@ -319,12 +319,12 @@ class QLRun(PythonAlgorithm):
...
@@ -319,12 +319,12 @@ class QLRun(PythonAlgorithm):
probWs
=
CreateWorkspace
(
OutputWorkspace
=
probWS
,
DataX
=
xProb
,
DataY
=
yProb
,
DataE
=
eProb
,
\
probWs
=
CreateWorkspace
(
OutputWorkspace
=
probWS
,
DataX
=
xProb
,
DataY
=
yProb
,
DataE
=
eProb
,
\
Nspec
=
3
,
UnitX
=
'
MomentumTransfer
'
)
Nspec
=
3
,
UnitX
=
'
MomentumTransfer
'
)
outWS
=
C2Fw
(
self
.
_samWS
[:
-
4
],
fname
)
outWS
=
C2Fw
(
self
.
_samWS
[:
-
4
],
fname
)
if
self
.
_
P
lot
!=
'
None
'
:
if
self
.
_
p
lot
!=
'
None
'
:
QuasiPlot
(
fname
,
self
.
_
P
lot
,
res_plot
,
self
.
_
L
oop
)
QuasiPlot
(
fname
,
self
.
_
p
lot
,
res_plot
,
self
.
_
l
oop
)
if
self
.
_program
==
'
QSe
'
:
if
self
.
_program
==
'
QSe
'
:
outWS
=
C2Se
(
fname
)
outWS
=
C2Se
(
fname
)
if
self
.
_
P
lot
!=
'
None
'
:
if
self
.
_
p
lot
!=
'
None
'
:
QuasiPlot
(
fname
,
self
.
_
P
lot
,
res_plot
,
self
.
_
L
oop
)
QuasiPlot
(
fname
,
self
.
_
p
lot
,
res_plot
,
self
.
_
l
oop
)
#Add some sample logs to the output workspaces
#Add some sample logs to the output workspaces
CopyLogs
(
InputWorkspace
=
self
.
_samWS
,
OutputWorkspace
=
outWS
)
CopyLogs
(
InputWorkspace
=
self
.
_samWS
,
OutputWorkspace
=
outWS
)
...
@@ -334,7 +334,7 @@ class QLRun(PythonAlgorithm):
...
@@ -334,7 +334,7 @@ class QLRun(PythonAlgorithm):
QLAddSampleLogs
(
fitWS
,
self
.
_resWS
,
prog
,
self
.
_background
,
self
.
_elastic
,
erange
,
QLAddSampleLogs
(
fitWS
,
self
.
_resWS
,
prog
,
self
.
_background
,
self
.
_elastic
,
erange
,
(
nbin
,
nrbin
),
self
.
_resnormWS
,
self
.
_wfile
)
(
nbin
,
nrbin
),
self
.
_resnormWS
,
self
.
_wfile
)
if
self
.
_
S
ave
:
if
self
.
_
s
ave
:
fit_path
=
os
.
path
.
join
(
workdir
,
fitWS
+
'
.nxs
'
)
fit_path
=
os
.
path
.
join
(
workdir
,
fitWS
+
'
.nxs
'
)
SaveNexusProcessed
(
InputWorkspace
=
fitWS
,
Filename
=
fit_path
)
SaveNexusProcessed
(
InputWorkspace
=
fitWS
,
Filename
=
fit_path
)
out_path
=
os
.
path
.
join
(
workdir
,
outWS
+
'
.nxs
'
)
# path name for nxs file
out_path
=
os
.
path
.
join
(
workdir
,
outWS
+
'
.nxs
'
)
# path name for nxs file
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment