Changeset 747334d in sasview for src/sas/sascalc

Timestamp:

Apr 6, 2017 4:27:22 AM (8 years ago)

Author:

Adam Washington <adam.washington@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d3bce8c

Parents:

0ac6e11

Message:

Add yacceptance

Needed to correspond to zacceptance for 2D sesans

Location:

src/sas/sascalc/dataloader

Files:

• data_info.py (modified) (1 diff)
• readers/cansas_constants.py (modified) (1 diff)
• readers/cansas_reader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/data_info.py

@@ -354 +354 @@
     ## SESANS zacceptance
     zacceptance = None
+    yacceptance = None
 
     def __init__(self):

src/sas/sascalc/dataloader/readers/cansas_constants.py

@@ -135 +135 @@
                              "Sesans": {"storeas": "content"},
                              "zacceptance": {"storeas": "float"},
+                             "yacceptance": {"storeas": "float"},
                              "<any>" : ANY
                             }

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -290 +290 @@
                 elif tagname == 'Sesans':
                     self.current_datainfo.isSesans = bool(data_point)
+                elif tagname == 'yacceptance':
+                    self.current_datainfo.sample.yacceptance = (data_point, unit)
                 elif tagname == 'zacceptance':
                     self.current_datainfo.sample.zacceptance = (data_point, unit)
@@ -1055 +1057 @@
             sesans.text = str(datainfo.isSesans)
             node.append(sesans)
+            self.write_node(node, "yacceptance", datainfo.sample.yacceptance[0],
+                             {'unit': datainfo.sample.yacceptance[1]})
             self.write_node(node, "zacceptance", datainfo.sample.zacceptance[0],
                              {'unit': datainfo.sample.zacceptance[1]})