Skip to content

Commit

Permalink
refs #8628. Fix merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
OwenArnold committed Dec 17, 2013
2 parents 7ab3017 + 83a1c91 commit 16cbe9b
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ def quick_explicit(run, i0_monitor_index, lambda_min, lambda_max, background_mi
_monInt = Integration(InputWorkspace=_I0P,RangeLower=int_min,RangeUpper=int_max)
IvsLam = Divide(LHSWorkspace=_detector_ws,RHSWorkspace=_monInt)
names = mtd.getObjectNames()

IvsLam = transCorr(trans, IvsLam, lambda_min, lambda_max, background_min, background_max,
int_min, int_max, detector_index_ranges, i0_monitor_index)
RenameWorkspace(InputWorkspace=IvsLam, OutputWorkspace="IvsLam") # TODO: Hardcoded names are bad
Expand Down

0 comments on commit 16cbe9b

Please sign in to comment.