Changeset 2733188 in sasview

Timestamp:

Nov 30, 2009 10:58:31 AM (14 years ago)

Author:

Mathieu Doucet <doucetm@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ef9ed58

Parents:

2cce133

Message:

dataloader: make sure the data are kept as numpy arrays.

File:

• DataLoader/data_info.py (modified) (1 diff)

DataLoader/data_info.py

@@ -53 +53 @@
     
     def __init__(self,x,y,dx=None,dy=None,dxl=None,dxw=None):
-        self.x = x
-        self.y = y
-        self.dx = dx
-        self.dy = dy
-        self.dxl = dxl
-        self.dxw = dxw
+        self.x = numpy.asarray(x)
+        self.y = numpy.asarray(y)
+        if dx is not None: self.dx = numpy.asarray(dx)
+        if dy is not None: self.dy = numpy.asarray(dy)
+        if dxl is not None: self.dxl = numpy.asarray(dxl)
+        if dxw is not None: self.dxw = numpy.asarray(dxw)
 
     def xaxis(self, label, unit):