From 0d9da3f1fb5375d10bc3437a846a2bd8c4e802bf Mon Sep 17 00:00:00 2001
From: Tom Titcombe <t.j.titcombe@gmail.com>
Date: Wed, 16 Jan 2019 11:56:08 +0000
Subject: [PATCH] Remove call to move HAB
Refs #23960
---
.../WorkflowAlgorithms/SANS/SANSLoad.py | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
index c8ef16faae3..4909674cdd8 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py
@@ -346,20 +346,13 @@ class SANSLoad(ParallelDataProcessorAlgorithm):
if beam_coordinates:
move_alg.setProperty("BeamCoordinates", beam_coordinates)
- # If component was specified then use it
- # TODO check if system tests pass when both components are moved
- # If they are, remove the commented out lines
- #component = self.getProperty("Component").value
- #if beam_coordinates:
- #move_alg.setProperty("Component", component)
-
- # Move the HAB
- move_alg.setProperty("Component", "HAB")
- move_alg.setProperty("Workspace", zeroed_workspace)
- move_alg.execute()
+ component = self.getProperty("Component").value
+ if not component:
+ component = "LAB"
- # Move the LAB
- move_alg.setProperty("Component", "LAB")
+ # ZOOM and LARMOR only have LAB, SANS2D and LOQ move both at once.
+ move_alg.setProperty("Component", component)
+ move_alg.setProperty("Workspace", zeroed_workspace)
move_alg.execute()
def _get_progress_for_file_loading(self, data):
--
GitLab