Skip to content

Commit

Permalink
Merge branch 'bugfix/9344_indirect_pep8_python_refactor' into develop
Browse files Browse the repository at this point in the history
Should fix failing system tests

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectAbsCor.py

Refs #9344
  • Loading branch information
DanNixon committed Aug 18, 2014
2 parents 84e4eeb + bbe8ad9 commit 0c2d698
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/scripts/Inelastic/IndirectAbsCor.py
Expand Up @@ -147,7 +147,7 @@ def AbsRun(inputWS, geom, beam, num_can, size, density, sigs, siga, avar, verbos
# geometry is flat
if geom == 'flt':
angles = [avar, det[n]]
(a1, a2, a3, a4) = FlatAbs(num_can, size, density, sigs, siga, angles, waves)
(a1, a2, a3, a4) = FlatAbs(num_can, size, density, sigs, siga, angles, waves)
kill = 0

#geometry is a cylinder
Expand Down Expand Up @@ -195,7 +195,7 @@ def AbsRun(inputWS, geom, beam, num_can, size, density, sigs, siga, avar, verbos
NSpec=ndet, UnitX='Wavelength',
VerticalAxisUnit='MomentumTransfer', VerticalAxisValues=q_axis)

CreateWorkspace(OutputWorkspace=ass_ws, DataX=data_x, DataY=data_a2,
CreateWorkspace(OutputWorkspace=assc_ws, DataX=data_x, DataY=data_a2,
NSpec=ndet, UnitX='Wavelength',
VerticalAxisUnit='MomentumTransfer', VerticalAxisValues=q_axis)

Expand Down

0 comments on commit 0c2d698

Please sign in to comment.