Skip to content

Commit

Permalink
Refs #5178. Removed UnwrapRef from the algorithm.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Apr 30, 2012
1 parent 2546e42 commit 6aa897a
Showing 1 changed file with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,7 @@ def PyInit(self):
self.declareFileProperty("CharacterizationRunsFile", "", FileAction.OptionalLoad,
['.txt'],
Description="File with characterization runs denoted")
self.declareProperty("UnwrapRef", 0.,
Description="Reference total flight path for frame unwrapping. Zero skips the correction")
self.declareProperty("LowResRef", 0.,
self.declareProperty("LowResRef", 0.,
Description="Reference DIFC for resolution removal. Zero skips the correction")
self.declareProperty("CropWavelengthMin", 0.,
Description="Crop the data at this minimum wavelength. Overrides LowResRef.")
Expand Down Expand Up @@ -418,10 +416,9 @@ def _focus(self, wksp, calib, info, filterLogs=None, preserveEvents=True,
else:
Rebin(InputWorkspace=wksp, OutputWorkspace=wksp, Params=binning)
AlignDetectors(InputWorkspace=wksp, OutputWorkspace=wksp, OffsetsWorkspace=self._instrument + "_offsets")
LRef = self.getProperty("UnwrapRef")
DIFCref = self.getProperty("LowResRef")
wavelengthMin = self.getProperty("CropWavelengthMin")
if (LRef > 0.) or (DIFCref > 0.) or (wavelengthMin>0): # super special Jason stuff
if (DIFCref > 0.) or (wavelengthMin>0): # super special Jason stuff
kwargs = {}
try:
if info.tmin > 0:
Expand All @@ -431,8 +428,6 @@ def _focus(self, wksp, calib, info, filterLogs=None, preserveEvents=True,
except:
pass
ConvertUnits(InputWorkspace=wksp, OutputWorkspace=wksp, Target="TOF") # corrections only work in TOF for now
if LRef > 0:
UnwrapSNS(InputWorkspace=wksp, OutputWorkspace=wksp, LRef=LRef, **kwargs)
if DIFCref > 0. or wavelengthMin > 0.:
if kwargs.has_key("Tmax"):
del kwargs["Tmax"]
Expand Down

0 comments on commit 6aa897a

Please sign in to comment.