Changes in src/sas/sascalc/dataloader/readers/cansas_reader.py [463e7ffc:747334d] in sasview

File:

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

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

@@ -33 +33 @@
 import xml.dom.minidom
 from xml.dom.minidom import parseString
-
-logger = logging.getLogger(__name__)
 
 PREPROCESS = "xmlpreprocess"
@@ -292 +290 @@
                 elif tagname == 'Sesans':
                     self.current_datainfo.isSesans = bool(data_point)
+                elif tagname == 'yacceptance':
+                    self.current_datainfo.sample.yacceptance = (data_point, unit)
                 elif tagname == 'zacceptance':
                     self.current_datainfo.sample.zacceptance = (data_point, unit)
@@ -1057 +1057 @@
             sesans.text = str(datainfo.isSesans)
             node.append(sesans)
+            self.write_node(node, "yacceptance", datainfo.sample.yacceptance[0],
+                             {'unit': datainfo.sample.yacceptance[1]})
             self.write_node(node, "zacceptance", datainfo.sample.zacceptance[0],
                              {'unit': datainfo.sample.zacceptance[1]})
@@ -1473 +1475 @@
                             self.errors.add(err_mess)
                             if optional:
-                                logger.info(err_mess)
+                                logging.info(err_mess)
                             else:
                                 raise ValueError, err_mess
@@ -1482 +1484 @@
                         self.errors.add(err_mess)
                         if optional:
-                            logger.info(err_mess)
+                            logging.info(err_mess)
                         else:
                             raise ValueError, err_mess