Skip to content

Commit

Permalink
Re #6253. Don't run filtering methods if working with histogram data.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Jan 28, 2013
1 parent 9bc4a94 commit 8165b7c
Showing 1 changed file with 7 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,13 @@ def _focusChunks(self, runnumber, extension, filterWall, calib, filterLogs=["",
temp = self._loadData(runnumber, extension, filterWall, **chunk)
if self._info is None:
self._info = self._getinfo(temp)
if (self._filterBadPulses and filterBadPulsesOverride):
temp = api.FilterBadPulses(InputWorkspace=temp, OutputWorkspace=temp)
if len(filterLogs[0]) > 0:
temp = api.FilterByLogValue(InputWorkspace=temp, OutputWorkspace=temp,
LogName=filterLogs[0],
MinimumValue=filterLogs[1], MaximumValue=filterLogs[2])
if not "histo" in extension:
if (self._filterBadPulses and filterBadPulsesOverride):
temp = api.FilterBadPulses(InputWorkspace=temp, OutputWorkspace=temp)
if len(filterLogs[0]) > 0:
temp = api.FilterByLogValue(InputWorkspace=temp, OutputWorkspace=temp,
LogName=filterLogs[0],
MinimumValue=filterLogs[1], MaximumValue=filterLogs[2])
temp = api.AlignAndFocusPowder(InputWorkspace=temp, OutputWorkspace=temp, CalFileName=calib,
Params=self._binning, ResampleX=self._resampleX, Dspacing=self._bin_in_dspace,
DMin=self._info.dmin, DMax=self._info.dmax, TMin=self._info.tmin, TMax=self._info.tmax,
Expand Down

0 comments on commit 8165b7c

Please sign in to comment.