Re #6151 Fix problem with always writing files

mantidproject · Dec 19, 2012 · 568b39a · 568b39a
1 parent 0847683
commit 568b39a
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...Mantid/Framework/PythonInterface/PythonAlgorithms/WorkflowAlgorithms/HFIRSANSReduction.py b/...Mantid/Framework/PythonInterface/PythonAlgorithms/WorkflowAlgorithms/HFIRSANSReduction.py
@@ -195,6 +195,15 @@ def PyExec(self):
                 if alg.existsProperty("ReductionProperties"):
                     alg.setProperty("ReductionProperties", property_manager_name)
                 alg.execute()
+                meas_trans = None
+                meas_err = None
+                if alg.existsProperty("MeasuredTransmission"):
+                    meas_trans = alg.getProperty("MeasuredTransmission").value
+                    property_manager.declareProperty("MeasuredBckTransmissionValue", meas_trans)
+                if alg.existsProperty("MeasuredError"):
+                    meas_err = alg.getProperty("MeasuredError").value 
+                    property_manager.declareProperty("MeasuredBckTransmissionError", meas_err)               
+
                 if alg.existsProperty("OutputMessage"):
                     output_msg += alg.getProperty("OutputMessage").value+'\n'
                 background_ws = '__'+background_ws+'_reduced'
@@ -245,8 +254,8 @@ def PyExec(self):
         # Verify output directory and save data
         if "OutputDirectory" in property_list:
             output_dir = property_manager.getProperty("OutputDirectory").value
-            if len(output_dir)==0:
-                output_dir = os.path.dirname(filename)
+            #if len(output_dir)==0:
+            #    output_dir = os.path.dirname(filename)
             if os.path.isdir(output_dir):
                 output_msg += self._save_output(iq_output, iqxy_output, 
                                                 output_dir, property_manager)