Changeset 1b9a367 in sasview

Timestamp:

Apr 10, 2017 8:03:41 AM (8 years ago)

Author:

Tim Snow <tim.snow@…>

Children:

cbb9551

Parents:

0765c00

Message:

Commit before merge with master

As in title

File:

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

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

@@ -195 +195 @@
         """
 
-        # self.reset_state()
         self._check_for_empty_data()
         self._initialize_new_data_set(dom)
-        # self.current_dataset = plottable_1D(np.array(0), np.array(0))
-        # self.add_data_set()
 
         self.names.append("SASentry")
@@ -211 +208 @@
         # Go through each child in the parent element
         for sasNode in dom:
-            # Add a new data home
-            # self.add_data_set()
             # Get the element name and set the current name's level
             currentTagName = sasNode.tag.replace(self.base_ns, "")
@@ -667 +662 @@
                 self.current_datainfo.meta_data[new_key] = sasNode.text
 
-        # 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
 
     def _is_call_local(self):