Changeset 1b7842d in sasview

Timestamp:

Apr 10, 2017 10:02:20 AM (7 years ago)

Author:

Tim Snow <tim.snow@…>

Children:

c8780f11

Parents:

9a39657

Message:

Travis fixes

Changed logic to eliminate errors

File:

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

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

@@ -220 +220 @@
                     multipleEntries = True
 
-                if sasNode[0].text is not None:
-                    for setupNode in sasNode[0]:
+                for setupNode in sasNode[0]:
+                    if setupNode.text is not None:
                         # Iterating through the tags in the unit node, getting their tag name and respective unit
                         setupTagName = setupNode.tag.replace(self.base_ns, "")
@@ -279 +279 @@
                             pass
 
-                    # If there's more data present, let's deal with that too
-                    for loopIter in range(1, len(sasNode)):
-                        for dataNode in sasNode[loopIter]:
-                            # Iterating through the tags in the unit node, getting their tag name and respective unit
-                            dataTagName = dataNode.tag.replace(self.base_ns, "")
-                            # Creating our data array first
-                            dataArray = np.fromstring(dataNode.text, dtype=float, sep=",")
-
-                            if dataTagName == "I":
-                                self.current_dataset.y[loopIter] = dataArray
-                            elif dataTagName == "Q":
-                                self.current_dataset.x[loopIter] = dataArray
-                            elif dataTagName == "Idev":
-                                self.current_dataset.dy[loopIter] = dataArray
-                            elif dataTagName == "Qdev":
-                                self.current_dataset.dx[loopIter] = dataArray
-                            elif dataTagName == "Qx":
-                                self.current_dataset.qx_data[loopIter] = dataArray
-                            elif dataTagName == "Qy":
-                                self.current_dataset.qy_data[loopIter] = dataArray
-                            elif dataTagName == "Qxdev":
-                                self.current_dataset.dqx_data[loopIter] = dataArray
-                            elif dataTagName == "Qydev":
-                                self.current_dataset.dqy_data[loopIter] = dataArray
-                            elif dataTagName == "dQw":
-                                self.current_dataset.dxw[loopIter] = dataArray
-                            elif dataTagName == "dQl":
-                                self.current_dataset.dxl[loopIter] = dataArray
-
-                    self._check_for_empty_resolution()
-                    self.data.append(self.current_dataset)
+                # If there's more data present, let's deal with that too
+                for loopIter in range(1, len(sasNode)):
+                    for dataNode in sasNode[loopIter]:
+                        # Iterating through the tags in the unit node, getting their tag name and respective unit
+                        dataTagName = dataNode.tag.replace(self.base_ns, "")
+                        # Creating our data array first
+                        dataArray = np.fromstring(dataNode.text, dtype=float, sep=",")
+
+                        if dataTagName == "I":
+                            self.current_dataset.y[loopIter] = dataArray
+                        elif dataTagName == "Q":
+                            self.current_dataset.x[loopIter] = dataArray
+                        elif dataTagName == "Idev":
+                            self.current_dataset.dy[loopIter] = dataArray
+                        elif dataTagName == "Qdev":
+                            self.current_dataset.dx[loopIter] = dataArray
+                        elif dataTagName == "Qx":
+                            self.current_dataset.qx_data[loopIter] = dataArray
+                        elif dataTagName == "Qy":
+                            self.current_dataset.qy_data[loopIter] = dataArray
+                        elif dataTagName == "Qxdev":
+                            self.current_dataset.dqx_data[loopIter] = dataArray
+                        elif dataTagName == "Qydev":
+                            self.current_dataset.dqy_data[loopIter] = dataArray
+                        elif dataTagName == "dQw":
+                            self.current_dataset.dxw[loopIter] = dataArray
+                        elif dataTagName == "dQl":
+                            self.current_dataset.dxl[loopIter] = dataArray
+
+                self._check_for_empty_resolution()
+                self.data.append(self.current_dataset)
 
             # If it's not data, let's check for other tags starting with skippable ones...
@@ -574 +574 @@
             elif currentTagName == "SASprocess":
                 for processNode in sasNode:
-                    processTagName = setupNode.tag.replace(self.base_ns, "")
-                    units = setupNode.attrib.get("unit", "")
+                    processTagName = processNode.tag.replace(self.base_ns, "")
+                    units = processNode.attrib.get("unit", "")
 
                     if processTagName == "name":
@@ -615 +615 @@
                     multipleEntries == True
 
-                if sasNode[0].text is not None:
-                    for setupNode in sasNode[0]:
+                for setupNode in sasNode[0]:
+                    if setupNode.text is not None:
                         # Iterating through the tags in the unit node, getting their tag name and respective unit
                         setupTagName = setupNode.tag.replace(self.base_ns, "")
@@ -641 +641 @@
                             self.transspectrum.wavelength_unit = transmissionDataUnits
 
-                    # If there's more data present, let's deal with that too
-                    for loopIter in range(1, len(sasNode)):
-                        for dataNode in sasNode[loopIter]:
-                            dataTagName = dataNode.tag.replace(self.base_ns, "")
-                            dataArray = np.fromstring(dataNode.text, dtype=float, sep=",")
-
-                            if dataTagName == "T":
-                                self.transspectrum.transmission[loopIter] = dataArray
-                            elif dataTagName == "Tdev":
-                                self.transspectrum.transmission_deviation[loopIter] = dataArray
-                            elif dataTagName == "Lambda":
-                                self.transspectrum.wavelength[loopIter] = dataArray
-
-                    self.current_datainfo.trans_spectrum.append(self.transspectrum)
-                    self.transspectrum = TransmissionSpectrum()
+                # If there's more data present, let's deal with that too
+                for loopIter in range(1, len(sasNode)):
+                    for dataNode in sasNode[loopIter]:
+                        dataTagName = dataNode.tag.replace(self.base_ns, "")
+                        dataArray = np.fromstring(dataNode.text, dtype=float, sep=",")
+
+                        if dataTagName == "T":
+                            self.transspectrum.transmission[loopIter] = dataArray
+                        elif dataTagName == "Tdev":
+                            self.transspectrum.transmission_deviation[loopIter] = dataArray
+                        elif dataTagName == "Lambda":
+                            self.transspectrum.wavelength[loopIter] = dataArray
+
+                self.current_datainfo.trans_spectrum.append(self.transspectrum)
+                self.transspectrum = TransmissionSpectrum()