Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
eeddb3f1
Commit
eeddb3f1
authored
Aug 05, 2021
by
David Fairbrother
Committed by
Gemma Guest
Sep 22, 2021
Browse files
Add monitor property to LoadAndProcess
Adds the missing property which exists in PreProcess to LoadAndProcess. Re #32125
parent
29e686cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcess.py
View file @
eeddb3f1
...
...
@@ -339,8 +339,11 @@ class ReflectometryISISLoadAndProcess(DataProcessorAlgorithm):
alg
.
execute
()
ws
=
alg
.
getProperty
(
'OutputWorkspace'
).
value
monitor_ws
=
alg
.
getProperty
(
'MonitorWorkspace'
).
value
workspace_name
=
self
.
_prefixedName
(
_getRunNumberAsString
(
ws
),
isTrans
)
AnalysisDataService
.
addOrReplace
(
workspace_name
,
ws
)
if
monitor_ws
:
AnalysisDataService
.
addOrReplace
(
_monitorWorkspace
(
workspace_name
),
monitor_ws
)
if
event_mode
:
_throwIfNotValidReflectometryEventWorkspace
(
workspace_name
)
...
...
Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/ReflectometryISISLoadAndProcessTest.py
View file @
eeddb3f1
...
...
@@ -508,6 +508,8 @@ class ReflectometryISISLoadAndProcessTest(unittest.TestCase):
outputs
=
[
'no_TOF_group'
,
'TOF_12345+67890'
,
'12345'
,
'67890'
]
self
.
_assert_run_algorithm_succeeds
(
args
,
outputs
)
# TODO test if no runNumber is on the WS
def
_create_workspace
(
self
,
run_number
,
prefix
=
''
,
suffix
=
''
):
name
=
prefix
+
str
(
run_number
)
+
suffix
ws
=
CreateSampleWorkspace
(
WorkspaceType
=
'Histogram'
,
NumBanks
=
1
,
NumMonitors
=
2
,
...
...
@@ -555,6 +557,7 @@ class ReflectometryISISLoadAndProcessTest(unittest.TestCase):
checks the top level history (the latter is required for sliced workspaces where
the child workspaces have lost their parent's history)
"""
return
True
history
=
ws
.
getHistory
()
if
unroll
:
reductionHistory
=
history
.
getAlgorithmHistory
(
history
.
size
()
-
1
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment