Skip to content

Commit

Permalink
Re #11421 minor Comments
Browse files Browse the repository at this point in the history
  • Loading branch information
abuts committed Mar 25, 2015
1 parent b995db1 commit dd268d2
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions Code/Mantid/scripts/Inelastic/Direct/DirectEnergyConversion.py
Expand Up @@ -421,8 +421,8 @@ def convert_to_energy(self,wb_run=None,sample_run=None,ei_guess=None,rebin=None,
if self.check_background:
# find the count rate seen in the regions of the histograms defined
# as the background regions, if the user defined such region.
# This has to be done here, as workspace will be cut in chunks and bg regions --
# removed
# In multirep mode this has to be done here, as workspace
# will be cut in chunks and bg regions -- removed
ws_base = PropertyManager.sample_run.get_workspace()
bkgd_range = self.bkgd_range
bkgr_ws = self._find_or_build_bkgr_ws(ws_base,bkgd_range[0],bkgd_range[1])
Expand All @@ -432,7 +432,9 @@ def convert_to_energy(self,wb_run=None,sample_run=None,ei_guess=None,rebin=None,
else:
self._multirep_mode = False
num_ei_cuts = 0

#------------------------------------------------------------------------------------------
# Main loop over incident energies
#------------------------------------------------------------------------------------------
cut_ind = 0 # do not do enumerate if it generates all sequence at once
# -- code below uses current energy state from PropertyManager.incident_energy
for ei_guess in PropertyManager.incident_energy:
Expand Down Expand Up @@ -485,6 +487,9 @@ def convert_to_energy(self,wb_run=None,sample_run=None,ei_guess=None,rebin=None,
else: # delete workspace if no output is requested
self.sample_run = None
#end_for
#------------------------------------------------------------------------------------------
# END Main loop over incident energies
#------------------------------------------------------------------------------------------

end_time = time.time()
prop_man.log("*** Elapsed time = {0} sec".format(end_time - start_time),'notice')
Expand Down Expand Up @@ -872,7 +877,7 @@ def process_block(tof_range):
else:
tof_min,t_step,tof_max = process_block(TOF_range)
#end
# add 5% for detectors positions in IDF not corresponding to shifted positions
# add 5% for detectors specified in Par file are shifted a bit and not min-max det any more
return (0.95*tof_min,t_step,1.05*tof_max)
#return (tof_min,t_step,tof_max)
#
Expand Down

0 comments on commit dd268d2

Please sign in to comment.