Refs #4930. Adding extra blocks in python for iparm file.

mantidproject · Mar 7, 2012 · 8564f4f · 8564f4f
1 parent da53335
commit 8564f4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
@@ -76,6 +76,8 @@ def _generateFocusPos(self, lines):
             temp = lines[0]
             temp = temp.replace("Instrument parameter file:", "")
             self.iparmFile = temp.strip()
+            if len(self.iparmFile) <= 0:
+                self.iparmFile = None
             lines = lines[1:] # delete this line
 
             # get the spectra into a buffer
@@ -378,7 +380,8 @@ def _focus(self, wksp, calib, info, filterLogs=None, preserveEvents=True,
         self.log().notice("FOCUS:" + str(focusPos))
         if not focusPos is None:
             EditInstrumentGeometry(Workspace=wksp, NewInstrument=False, **focusPos)
-            wksp.getRun()['iparm_file'] = self._config.iparmFile
+            if (self._config.iparmFile is not None) and (len(self._config.iparmFile) > 0):
+                wksp.getRun()['iparm_file'] = self._config.iparmFile
 
         ConvertUnits(InputWorkspace=wksp, OutputWorkspace=wksp, Target="TOF")
         if preserveEvents and not "histo" in self.getProperty("Extension"):

diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py
@@ -76,6 +76,8 @@ def _generateFocusPos(self, lines):
             temp = lines[0]
             temp = temp.replace("Instrument parameter file:", "")
             self.iparmFile = temp.strip()
+            if len(self.iparmFile) <= 0:
+                self.iparmFile = None
             lines = lines[1:] # delete this line
 
             # get the spectra into a buffer
@@ -417,7 +419,8 @@ def _focus(self, wksp, calib, info, filterLogs=None, preserveEvents=True,
         self.log().notice("FOCUS:" + str(focusPos))
         if not focusPos is None:
             EditInstrumentGeometry(Workspace=wksp, NewInstrument=False, **focusPos)
-            wksp.getRun()['iparm_file'] = self._config.iparmFile
+            if (self._config.iparmFile is not None) and (len(self._config.iparmFile) > 0):
+                wksp.getRun()['iparm_file'] = self._config.iparmFile
 
         ConvertUnits(InputWorkspace=wksp, OutputWorkspace=wksp, Target="TOF")
         if preserveEvents and not "histo" in self.getProperty("Extension"):