From 870d5516391a5660f07bfee73fda453b9cd64531 Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Tue, 10 Mar 2015 18:46:15 +0000
Subject: [PATCH] Re #11292 Fixing error with non-standard file extension not
propa-
gating properly
---
.../SystemTests/tests/analysis/ISIS_LETReduction.py | 6 +++---
.../scripts/Inelastic/Direct/DirectEnergyConversion.py | 2 +-
Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py | 9 ++++++++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
index 4ef143cfc20..dec44101430 100644
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
@@ -1,6 +1,6 @@
-""" Sample LET reduction script """
+""" Sample LET reduction script """
import os
-os.environ["PATH"] = r"c:/Mantid/Code/builds/br_master/bin/Release;"+os.environ["PATH"]
+#os.environ["PATH"] = r"c:/Mantid/Code/builds/br_master/bin/Release;"+os.environ["PATH"]
from Direct.ReductionWrapper import *
@@ -291,4 +291,4 @@ if __name__=="__main__":
#if not rez:
# raise RuntimeError("validation failed with error: {0}".format(mess))
#else:
- # print "ALL Fine"
\ No newline at end of file
+ # print "ALL Fine"
\ No newline at end of file
diff --git a/Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py
index 1ba99869950..5213436b0e0 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -623,7 +623,7 @@ class DirectEnergyConversion(object):
data_ws = data_run.get_workspace()
monitor_ws = data_run.get_monitors_ws()
- if not monitor_ws:
+ if monitor_ws is None:
raise RuntimeError("Can not find monitors workspace for workspace {0}, run N{1}".\
format(data_ws.name(),data_ws.getRunNumber()))
separate_monitors = data_run.is_monws_separate()
diff --git a/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py b/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
index 36b63151e40..474f6c89ce2 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
@@ -410,13 +410,20 @@ class RunDescriptor(PropDescriptor):
self._clear_all()
# clear all would invalidate run number and workspace number
self._run_number = int(run_number)
+ self._ws_name = self._build_ws_name()
self._run_file_path = file_path
self._fext = fext
- self._ws_name = self._build_ws_name()
else: # nothing to do, there is workspace, which corresponds to this run number
# and it may be already loaded (may be not). Just nullify run list
# in case of previous workspace name came from a list.
self._run_list = None
+ if not self._ws_name in mtd:
+ # Change existing file path and file extension if alternatives are provided
+ if len(file_path)>0:
+ self._run_file_path = file_path
+ if not fext is None:
+ self._fext = fext
+
#--------------------------------------------------------------------------------------------------------------------
--
GitLab