Changeset 4597637 in sasview for src/sas/sascalc

Timestamp:

Apr 10, 2017 10:27:26 AM (8 years ago)

Author:

Tim Snow <tim.snow@…>

Children:

0b44113

Parents:

cbb9551

Message:

Merge aftermath

Added y-acceptance term back into the file reader after the merge
overwrote it

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (2 diffs)

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

@@ -269 +269 @@
                         self.current_datainfo.isSesans = bool(setupNode.text)
 
+                    elif setupTagName == "yacceptance":
+                        self.current_datainfo.sample.yacceptance = (setupNode.text, units)
                     elif setupTagName == "zacceptance":
                         self.current_datainfo.sample.zacceptance = (setupNode.text, units)
@@ -422 +424 @@
                                     beamData = beamNode.text
 
-                                    if beamTagName == "x" and self.parent_class == "beam_size":
+                                    if beamTagName == "x":
                                        self.current_datainfo.source.beam_size.x = beamData
                                        self.current_datainfo.source.beam_size_unit = beamUnits
-                                    elif beamTagName == "y" and self.parent_class == "beam_size":
+                                    elif beamTagName == "y":
                                         self.current_datainfo.source.beam_size.y = beamData
                                         self.current_datainfo.source.beam_size_unit = beamUnits