Re #11628 minor comments and export_normalization for dependent

properties.
mantidproject · Apr 30, 2015 · b56f31a · b56f31a
1 parent fb376b4
commit b56f31a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -352,6 +352,7 @@ def convert_to_energy(self,wb_run=None,sample_run=None,ei_guess=None,rebin=None,
         # and verify some other properties which can be wrong before starting a
         # long run.
         prop_man.log("****************************************************************")
+        prop_man.log("*** ISIS CONVERT TO ENERGY TRANSFER WRORKFLOW STARTED **********")
         prop_man.validate_properties()
         prop_man.log("*** Loading or retrieving sample run: {0}".format(prop_man.sample_run))
         prop_man.log("****************************************************************")
@@ -517,8 +518,7 @@ def convert_to_energy(self,wb_run=None,sample_run=None,ei_guess=None,rebin=None,
 # END Main loop over incident energies
 #------------------------------------------------------------------------------------------
 
-        end_time = time.time()
-        prop_man.log("*** Elapsed time = {0} sec".format(end_time - start_time),'notice')
+
         #Must! clear background ws (if present in multirep) to calculate background
         #source for next workspace
         if 'bkgr_ws_source' in mtd:
@@ -531,6 +531,11 @@ def convert_to_energy(self,wb_run=None,sample_run=None,ei_guess=None,rebin=None,
         #prop_man.wb_run = None
         # clear combined mask
         self.spectra_masks = None
+        end_time = time.time()
+        prop_man.log("*** ISIS CONVERT TO ENERGY TRANSFER WRORKFLOW FINISHED *********")
+        prop_man.log("*** Elapsed time : {0:>9.2f} sec                       *********".\
+                    format(end_time - start_time),'notice')
+        prop_man.log("****************************************************************")
         return result
 
     def _do_abs_corrections(self,deltaE_ws_sample,cashed_mono_int,ei_guess,\

diff --git a/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py b/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
@@ -1508,16 +1508,24 @@ def clear_monitors(self):
             return super(RunDescriptorDependent,self).clear_monitors()
         else:
             return self._host.clear_monitors()
+
     def get_masking(self,noutputs=None):
         if self._has_own_value:
             return super(RunDescriptorDependent,self).get_masking(noutputs)
         else:
             return self._host.get_masking(noutputs)
+
     def add_masked_ws(self,masked_ws):
         if self._has_own_value:
             return super(RunDescriptorDependent,self).add_masked_ws(masked_ws)
         else:
             return self._host.add_masked_ws(masked_ws)
+
+    def export_normalization(self,other_workspace):
+        if self._has_own_value:
+            return super(RunDescriptorDependent,self).export_normalization(other_workspace)
+        else:
+            return self._host.export_normalization(other_workspace)
 #--------------------------------------------------------------------------------------------------------------------
 #--------------------------------------------------------------------------------------------------------------------
 def build_run_file_name(run_num,inst,file_path='',fext=''):