Changeset 7f0c93f in sasview

Timestamp:

Apr 10, 2017 10:45:22 AM (7 years ago)

Author:

Tim Snow <tim.snow@…>

Children:

2cda197

Parents:

cdfcfbd

Message:

End of day commit

Final changes for Travis

File:

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

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

@@ -458 +458 @@
                                 self.collimation.name = collimationData
 
-                            if collimationTagName == "aperture":
+                            elif collimationTagName == "aperture":
                                 for apertureNode in collimationNode:
                                     apertureTagName = apertureNode.tag.replace(self.base_ns, "")
@@ -464 +464 @@
                                     apertureData = apertureNode.text
 
-                                if tagname == "distance":
-                                    self.aperture.distance = apertureData
-                                    self.aperture.distance_unit = apertureUnits
-
-                            if collimationTagName == "size":
+                                    if apertureTagName == "distance":
+                                        self.aperture.distance = apertureData
+                                        self.aperture.distance_unit = apertureUnits
+
+                            elif collimationTagName == "size":
                                 for sizeNode in collimationNode:
                                     sizeTagName = sizeNode.tag.replace(self.base_ns, "")
@@ -474 +474 @@
                                     sizeData = sizeNode.text
 
-                                if tagname == "x":
-                                    self.aperture.size.x = sizeData
-                                    self.collimation.size_unit = sizeUnits
-                                elif tagname == "y":
-                                    self.aperture.size.y = sizeData
-                                    self.collimation.size_unit = sizeUnits
-                                elif tagname == "z":
-                                    self.aperture.size.z = sizeData
-                                    self.collimation.size_unit = sizeUnits
+                                    if sizeTagName == "x":
+                                        self.aperture.size.x = sizeData
+                                        self.collimation.size_unit = sizeUnits
+                                    elif sizeTagName == "y":
+                                        self.aperture.size.y = sizeData
+                                        self.collimation.size_unit = sizeUnits
+                                    elif sizeTagName == "z":
+                                        self.aperture.size.z = sizeData
+                                        self.collimation.size_unit = sizeUnits
 
                         self.current_datainfo.collimation.append(self.collimation)