Skip to content

Commit

Permalink
Re #8675. Fixed bug found by system tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Mar 24, 2014
1 parent 07d6c43 commit c532287
Showing 1 changed file with 6 additions and 6 deletions.
Expand Up @@ -206,14 +206,14 @@ def PyExec(self):
samRun = temp
info = tempinfo
else:
if (tempinfo.freq is not None) and (info.freq is not None) \
and (abs(tempinfo.freq - info.freq)/info.freq > .05):
if (tempinfo["frequency"] is not None) and (info["frequency"] is not None) \
and (abs(tempinfo["frequency"] - info["frequency"])/info["frequency"] > .05):
raise RuntimeError("Cannot add incompatible frequencies (%f!=%f)" \
% (tempinfo.freq, info.freq))
if (tempinfo.wl is not None) and (info.wl is not None) \
and abs(tempinfo.wl - info.wl)/info.freq > .05:
% (tempinfo["frequency"], info["frequency"]))
if (tempinfo["wavelength"] is not None) and (info["wavelength"] is not None) \
and abs(tempinfo["wavelength"] - info["wavelength"])/info["wavelength"] > .05:
raise RuntimeError("Cannot add incompatible wavelengths (%f != %f)" \
% (tempinfo.wl, info.wl))
% (tempinfo["wavelength"], info["wavelength"]))
samRun = api.Plus(LHSWorkspace=samRun, RHSWorkspace=temp, OutputWorkspace=samRun)
if samRun.id() == EVENT_WORKSPACE_ID:
samRun = api.CompressEvents(InputWorkspace=samRun, OutputWorkspace=samRun,
Expand Down

0 comments on commit c532287

Please sign in to comment.