From 1391a05248bef5f28abfebecd1b240ddcdbede5e Mon Sep 17 00:00:00 2001
From: Mathieu Doucet <doucetm@ornl.gov>
Date: Wed, 12 Jan 2011 20:21:41 +0000
Subject: [PATCH] Minor tweak to make EQSANS work out of the box, without
hard-coding Q range. Fixes #2226
---
.../reduction/instruments/sans/sans_reduction_steps.py | 2 +-
.../reduction/instruments/sans/sns_command_interface.py | 7 -------
.../Scripts/reduction/instruments/sans/sns_instrument.py | 2 ++
3 files changed, 3 insertions(+), 8 deletions(-)
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 ec7b573b0bd..9d447646b01 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 d177d04b9a9..05e1a802443 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 b4eb55b8622..12ecf5809ea 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):
"""
--
GitLab