Changeset 0765c00 in sasview

Timestamp:

Apr 10, 2017 7:54:57 AM (8 years ago)

Author:

Tim Snow <tim.snow@…>

Children:

1b9a367

Parents:

65e61c1

Message:

Data loads

After some digging found that the datasets weren’t being appended, so
this has now been fixed. Will go through and remove debugging bits now
in preparation of a pull request

File:

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

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

@@ -195 +195 @@
         """
 
-        self.reset_state()
+        # self.reset_state()
         self._check_for_empty_data()
         self._initialize_new_data_set(dom)
-        self.add_data_set()
+        # self.current_dataset = plottable_1D(np.array(0), np.array(0))
+        # self.add_data_set()
 
         self.names.append("SASentry")
@@ -247 +248 @@
                         self.current_dataset.dy = setupArray  
                     elif setupTagName == "Qdev":
-                        self.current_dataset.err_data = setupArray 
+                        self.current_dataset.dx = setupArray 
 
                     elif setupTagName == "Qx":
@@ -293 +294 @@
                             self.current_dataset.dy[loopIter] = dataArray
                         elif dataTagName == "Qdev":
-                            self.current_dataset.err_data[loopIter] = dataArray
+                            self.current_dataset.dx[loopIter] = dataArray
                         elif dataTagName == "Qx":
                             self.current_dataset.qx_data[loopIter] = dataArray
@@ -307 +308 @@
                             self.current_dataset.dxl[loopIter] = dataArray
 
-                if len(dataArray) == 1:
-                    self.current_dataset.x = self.current_dataset.x.reshape(len(sasNode))
-                    self.current_dataset.y = self.current_dataset.y.reshape(len(sasNode))
-                    self.current_dataset.err_data = self.current_dataset.err_data.reshape(len(sasNode))
-                    self.current_dataset.dy = self.current_dataset.dy.reshape(len(sasNode))
-
-
-                self.add_intermediate()
+                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...
@@ -488 +483 @@
                                     self.collimation.size_unit = sizeUnits
 
+                        self.current_datainfo.collimation.append(self.collimation)
+                        self.collimation = Collimation()
+
                     # Extract the detector
                     elif instrumentTagName == "SASdetector":
@@ -569 +567 @@
                                         self.detector.orientation.z = orientationData
                                         self.detector.orientation_unit = orientationUnits
+
+                        self.current_datainfo.detector.append(self.detector)
+                        self.detector = Detector()
 
             ## If we'e dealing with a process node
@@ -592 +593 @@
                         dic["unit"] = processNode.attrib.get("unit", "")
                         self.process.term.append(dic)
+
+                self.current_datainfo.process.append(self.process)
+                self.process = Process()
                 
             # If we're dealing with a process note node
@@ -601 +605 @@
             elif currentTagName == "SASnote":
                 for noteNode in sasNode:
-                    print '1'
                     self.current_datainfo.notes.append(noteNode.text)
 
@@ -655 +658 @@
                         self.transspectrum.wavelength[loopIter] = setupArray
 
+                self.current_datainfo.trans_spectrum.append(self.transspectrum)
+                self.transspectrum = TransmissionSpectrum()
+
+
             ## Everything else goes in meta_data
             else:
@@ -660 +667 @@
                 self.current_datainfo.meta_data[new_key] = sasNode.text
 
-        self._final_cleanup()
-        print self.current_dataset.y
-        print len(self.current_dataset.y)
+        # self._final_cleanup()
+        self.add_intermediate()
 
         # As before in the code, I guess in case we have to return a tuple for some reason...
-        return self.output, None
+        # return self.output, None