Changeset 48153283 in sasview for src/sas/data_util

Timestamp:

Feb 17, 2015 3:46:30 AM (9 years ago)

Author:

smk78

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

36c5910

Parents:

920928f (diff), 5dfdfa7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

Location:

src/sas/data_util

Files:

• nxsunit.py (modified) (2 diffs)
• media/data_operator_help.rst (modified) (1 diff)

src/sas/data_util/nxsunit.py

@@ -128 +128 @@
     temperature = _build_metric_units('kelvin','K')
     temperature.update(_build_metric_units('Kelvin','K'))
-
+    temperature.update(_build_metric_units('Celcius', 'C'))
+    temperature.update(_build_metric_units('celcius', 'C'))
+    
     charge = _build_metric_units('coulomb','C')
     charge.update({'microAmp*hour':0.0036})
@@ -146 +148 @@
     """
     Unit converter for NeXus style units.
-
     """
     # Define the units, using both American and European spelling.

src/sas/data_util/media/data_operator_help.rst

@@ -1 @@
-..data_operator_help.rst
+.. data_operator_help.rst
 
-Placeholder for data operator help
+.. This is a port of the original SasView html help file to ReSTructured text
+.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
+
+Data Operations Tool
+====================
+
+Description
+-----------
+This dialog panel provides arithmetic operations between two data sets (the 
+last data set could be a number).
+
+When data1 and data2 are selected, their x (or qx and qy for 2D) value(s)
+must match with each other.
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+How To
+------
+1. Type the data name resulted from an operation.
+
+2) Select a data/theory in the drop down menus. When data2 is set to number, 
+   type a number in the text control box.
+
+3) Select an arithmetic operator symbol; + (for addition), - (for subtraction), 
+   * (for multiplication), / (for division), and | (for combination of two data
+   sets).
+
+   If two data sets do not match, the operation will fail and the background color
+   of the combo box items will turn to red (WIN only).
+
+4) If the operation is successful, hit the Apply button to make the new data.
+   Then the data name will be shown up in the data box in the data explorer.
+
+Note: Any errors and warnings will be displayed at the bottom of the SasView
+window.
+
+.. image:: data_oper_pic.png