From 78787944a06ac8fa22c860773d13b872519ec043 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Tue, 26 Jun 2018 13:43:25 -0400
Subject: [PATCH] Add live data configuration for ARCS, CNCS, EQSANS, and SNAP
---
docs/source/release/v3.13.0/diffraction.rst | 2 +-
docs/source/release/v3.13.0/direct_inelastic.rst | 2 +-
docs/source/release/v3.13.0/sans.rst | 3 ++-
instrument/Facilities.xml | 12 ++++++++++++
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/docs/source/release/v3.13.0/diffraction.rst b/docs/source/release/v3.13.0/diffraction.rst
index 836601af582..2a223155883 100644
--- a/docs/source/release/v3.13.0/diffraction.rst
+++ b/docs/source/release/v3.13.0/diffraction.rst
@@ -21,7 +21,7 @@ Powder Diffraction
- :ref:`PDCalibration <algm-PDCalibration>` has major upgrades including making use of :ref:`FitPeaks <algm-FitPeaks>` for the individual peak fitting
- New NOMAD instrument geometry for 2018 run cycle
- New POWGEN instrument geometry for 2018 run cycle
-- New SNAP instrument geometry for 2018 run cycle
+- New SNAP instrument geometry for 2018 run cycle with configuration for live data
New Features
------------
diff --git a/docs/source/release/v3.13.0/direct_inelastic.rst b/docs/source/release/v3.13.0/direct_inelastic.rst
index e63f4ddf2e0..c2dc3841bd3 100644
--- a/docs/source/release/v3.13.0/direct_inelastic.rst
+++ b/docs/source/release/v3.13.0/direct_inelastic.rst
@@ -41,6 +41,7 @@ Instrument Definitions
- The source component of ILL's IN5 has been moved from :math:`z = -2` to :math:`z = -2.10945` meters and renamed to ``frame-overlap_chopper``.
- The source component of ILL's IN6 has been moved from :math:`z = -0.395` to :math:`z = -0.595` meters and renamed to ``suppressor_chopper``.
- New CNCS geometry and parameters for 2018B cycle
+- ARCS and CNCS are configured for live data
Python
------
@@ -48,4 +49,3 @@ Python
- The plotting methods in the :ref:`directtools <Directtools Python module>` python module now support logarithmic scales.
:ref:`Release 3.13.0 <v3.13.0>`
-
diff --git a/docs/source/release/v3.13.0/sans.rst b/docs/source/release/v3.13.0/sans.rst
index 66c94d39cdd..da228885983 100644
--- a/docs/source/release/v3.13.0/sans.rst
+++ b/docs/source/release/v3.13.0/sans.rst
@@ -19,13 +19,14 @@ New features
############
* A string of wavelength ranges can now be specified. A reduction is then done for each wavelength range.
* :ref:`SANSMask <algm-SANSMask>` is extended to have a `MaskedWorkspace` property, to copy the mask from.
+* EQSANS is configured for live data
Improvements
############
* Added thickness column to table in new GUI.
* The Beam centre finder now takes the default radius limits from the instrument parameter file if specified.
* Added EventSlice option to options column in new GUI.
-* Updated old backend to mask by detector ID rather than spectrum number, improving reliability.
+* Updated old backend to mask by detector ID rather than spectrum number, improving reliability.
* Added thickness column to table in new GUI.
* Added EventSlice option to options column in new GUI.
* Added Radius Cutoff and Wavelength Cutoff boxes to the old and new GUI.
diff --git a/instrument/Facilities.xml b/instrument/Facilities.xml
index 5d8fc70c90e..65436d1a7cd 100644
--- a/instrument/Facilities.xml
+++ b/instrument/Facilities.xml
@@ -480,6 +480,9 @@
<instrument name="SNAP" beamline="3">
<technique>Neutron Diffraction</technique>
+ <livedata>
+ <connection name="event" address="bl3-daq1.sns.gov:31415" listener="SNSLiveEventDataListener" />
+ </livedata>
</instrument>
<instrument name="REF_M" beamline="4A">
@@ -500,10 +503,16 @@
<technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique>
<technique>Neutron Diffraction</technique>
+ <livedata>
+ <connection name="event" address="bl5-daq1.sns.gov:31415" listener="SNSLiveEventDataListener" />
+ </livedata>
</instrument>
<instrument name="EQ-SANS" shortname="EQSANS" beamline="6">
<technique>Small Angle Scattering</technique>
+ <livedata>
+ <connection name="event" address="bl6-daq1.sns.gov:31415" listener="SNSLiveEventDataListener" />
+ </livedata>
</instrument>
<instrument name="VULCAN" beamline="7">
@@ -576,6 +585,9 @@
<technique>Neutron Spectroscopy</technique>
<technique>TOF Direct Geometry Spectroscopy</technique>
<technique>Neutron Diffraction</technique>
+ <livedata>
+ <connection name="event" address="bl18-daq1.sns.gov:31415" listener="SNSLiveEventDataListener" />
+ </livedata>
</instrument>
<instrument name="VENUS">
--
GitLab