Skip to content

Commit

Permalink
Re #7987. Removed noise run option from SNSPowderReduction.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Feb 5, 2014
1 parent 01f6246 commit 0d0614f
Showing 1 changed file with 3 additions and 25 deletions.
Expand Up @@ -466,32 +466,10 @@ def PyExec(self):
vnoiseRun = 0
else:
vnoiseRun = self._info.vnoise # noise run for the vanadium
if vnoiseRun > 0:
raise RuntimeError("Vanadium noise correction has been removed from the workflow")
vanRun = self._focusChunks(vanRun, SUFFIX, vanFilterWall, calib,
preserveEvents=False, normByCurrent = (vnoiseRun <= 0))

if (vnoiseRun > 0):
vnoiseRun = self._focusChunks(vnoiseRun, SUFFIX, vanFilterWall, calib,
preserveEvents=False, normByCurrent = False, filterBadPulsesOverride=False)
if mpiRank == 0:
vnoiseRun = api.ConvertUnits(InputWorkspace=vnoiseRun, OutputWorkspace=vnoiseRun, Target="TOF")
vnoiseRun = api.FFTSmooth(InputWorkspace=vnoiseRun, OutputWorkspace=vnoiseRun, Filter="Butterworth",
Params=self._vanSmoothing,IgnoreXBins=True,AllSpectra=True)
try:
vanDuration = vanRun.getRun().get('duration')
vanDuration = vanDuration.value
except:
vanDuration = 1.
try:
vbackDuration = vnoiseRun.getRun().get('duration')
vbackDuration = vbackDuration.value
except:
vbackDuration = 1.
vnoiseRun *= (vanDuration/vbackDuration)
vanRun -= vnoiseRun
vanRun = api.NormaliseByCurrent(InputWorkspace=vanRun, OutputWorkspace=vanRun)
workspacelist.append(str(vnoiseRun))
else:
vnoiseRun = None
preserveEvents=False, normByCurrent=normbycurrent)

vbackRun = self.getProperty("VanadiumBackgroundNumber").value
if vbackRun > 0:
Expand Down

1 comment on commit 0d0614f

@wdzhou
Copy link
Collaborator

@wdzhou wdzhou commented on 0d0614f Feb 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PDConfigFile still has 'vnoise' as a class variable. Shall it be removed?

Please sign in to comment.