diff --git a/Code/Mantid/Scripts/reduction/instruments/sans/sans_reduction_steps.py b/Code/Mantid/Scripts/reduction/instruments/sans/sans_reduction_steps.py index ec7b573b0bd5d53ade0002787bc202dbcf7d6166..9d447646b015f5f2f7b1c5b5a2ed3694a3108ec0 100644 --- a/Code/Mantid/Scripts/reduction/instruments/sans/sans_reduction_steps.py +++ b/Code/Mantid/Scripts/reduction/instruments/sans/sans_reduction_steps.py @@ -90,7 +90,7 @@ class BaseBeamFinder(ReductionStep): # We must convert the beam radius from pixels to meters if self._beam_radius is not None: - self._beam_radius *= reducer.instrument.pixel_size_x + self._beam_radius *= reducer.instrument.pixel_size_x/1000.0 beam_center = FindCenterOfMassPosition(workspace+'_int', Output = None, DirectBeam = direct_beam, diff --git a/Code/Mantid/Scripts/reduction/instruments/sans/sns_command_interface.py b/Code/Mantid/Scripts/reduction/instruments/sans/sns_command_interface.py index d177d04b9a91eb6bb0482ef4efd1fc4fad437947..05e1a802443cbd3731c9016638edea81f7d1b03f 100644 --- a/Code/Mantid/Scripts/reduction/instruments/sans/sns_command_interface.py +++ b/Code/Mantid/Scripts/reduction/instruments/sans/sns_command_interface.py @@ -12,13 +12,6 @@ def EQSANS(): NoSolidAngle() AzimuthalAverage() -def AzimuthalAverage(binning="0.001,0.001,0.05", suffix="_Iq", error_weighting=False, n_bins=100, n_subpix=1): - ReductionSingleton().set_azimuthal_averager(sans_reduction_steps.WeightedAzimuthalAverage(binning=binning, - suffix=suffix, - n_bins=n_bins, - n_subpix=n_subpix, - error_weighting=error_weighting)) - def FrameSkipping(value): ReductionSingleton().set_frame_skipping(value) diff --git a/Code/Mantid/Scripts/reduction/instruments/sans/sns_instrument.py b/Code/Mantid/Scripts/reduction/instruments/sans/sns_instrument.py index b4eb55b86224b5424e416a869c2afdef65ddd234..12ecf5809eaf2b30a4b1a8f74b8e67850375f0b4 100644 --- a/Code/Mantid/Scripts/reduction/instruments/sans/sns_instrument.py +++ b/Code/Mantid/Scripts/reduction/instruments/sans/sns_instrument.py @@ -20,6 +20,8 @@ class EQSANS(Instrument): self.pixel_size_y = 4.297 ## Nominal sample-detector distance sample_detector_distance = 0.0 + ## Detector name + self.detector_ID = "detector1" def get_default_beam_center(self): """