Changeset 5e6df0e in sasview for src/sas/sascalc

Timestamp:

Feb 7, 2017 9:39:39 AM (8 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

bcabf4e

Parents:

6d2b50b

Message:

Simplified the check for data error bars.

File:

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

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

@@ -1056 +1056 @@
         qy = ','.join([str(datainfo.qy_data[i]) for i in xrange(len(datainfo.qy_data))])
         intensity = ','.join([str(datainfo.data[i]) for i in xrange(len(datainfo.data))])
-        if datainfo.err_data is not None:
-            err = ','.join([str(datainfo.err_data[i]) for i in xrange(len(datainfo.err_data))])
-        if datainfo.dqy_data is not None:
-            dqy = ','.join([str(datainfo.dqy_data[i]) for i in xrange(len(datainfo.dqy_data))])
-        if datainfo.dqx_data is not None:
-            dqx = ','.join([str(datainfo.dqx_data[i]) for i in xrange(len(datainfo.dqx_data))])
-        if datainfo.mask is not None:
-            mask = ','.join([str(datainfo.mask[i]) for i in xrange(len(datainfo.mask))])
 
         self.write_node(point, "Qx", qx,
@@ -1072 +1064 @@
                         {'unit': datainfo._zunit})
         if datainfo.err_data is not None:
+            err = ','.join([str(datainfo.err_data[i]) for i in
+                            xrange(len(datainfo.err_data))])
             self.write_node(point, "Idev", err,
                             {'unit': datainfo._zunit})
         if datainfo.dqy_data is not None:
+            dqy = ','.join([str(datainfo.dqy_data[i]) for i in
+                            xrange(len(datainfo.dqy_data))])
             self.write_node(point, "Qydev", dqy,
                             {'unit': datainfo._yunit})
         if datainfo.dqx_data is not None:
+            dqx = ','.join([str(datainfo.dqx_data[i]) for i in
+                            xrange(len(datainfo.dqx_data))])
             self.write_node(point, "Qxdev", dqx,
                             {'unit': datainfo._xunit})
         if datainfo.mask is not None:
+            mask = ','.join(
+                [str(datainfo.mask[i]) for i in xrange(len(datainfo.mask))])
             self.write_node(point, "Mask", mask)