Changeset f31ab59 in sasview

Timestamp:

Dec 2, 2009 11:59:37 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3bb37ef

Parents:

f521f61

Message:

workign on testing invariant

File:

• Invariant/invariant.py (modified) (6 diffs)

Invariant/invariant.py

@@ -148 +148 @@
         # The data should be private
         self._data = self._get_data(data)
-        
+      
         # Since there are multiple variants of Q*, you should force the
         # user to use the get method and keep Q* a private data member
@@ -207 +207 @@
             #Process only data that inherited from DataLoader.Data_info.Data1D
             raise ValueError,"Data must be of type DataLoader.Data1D"
-        return self._scale * data - self._background
+        new_data = self._scale * data - self._background
+        new_data.dxl = data.dxl
+        new_data.dxw = data.dxw
+        return new_data
         
     def _fit(self, function, qmin=Q_MINIMUM, qmax=Q_MAXIMUM):
@@ -615 +618 @@
         """
         data = self._get_extra_data_high()
-        return self._get_qstar( data=data)
+        return self._get_qstar(data=data)
         
     def _get_extra_data_low(self):
@@ -658 +661 @@
         dxw = None
         if self._data.dxl is not None:
-            dxl = numpy.ones(1, INTEGRATION_NSTEPS)
+            dxl = numpy.ones(INTEGRATION_NSTEPS)
             dxl = dxl * self._data.dxl[0]
         if self._data.dxw is not None:
-            dxw = numpy.ones(1, INTEGRATION_NSTEPS)
+            dxw = numpy.ones(INTEGRATION_NSTEPS)
             dxw = dxw * self._data.dxw[0]
             
@@ -708 +711 @@
         dxw = None
         if self._data.dxl is not None:
-            dxl = numpy.ones(1, INTEGRATION_NSTEPS)
+            dxl = numpy.ones(INTEGRATION_NSTEPS)
             dxl = dxl * self._data.dxl[0]
         if self._data.dxw is not None:
-            dxw = numpy.ones(1, INTEGRATION_NSTEPS)
+            dxw = numpy.ones(INTEGRATION_NSTEPS)
             dxw = dxw * self._data.dxw[0]
             
@@ -718 +721 @@
         data_max.dxw = dxw
         self._data.clone_without_data(clone=data_max)
-        
+    
         return data_max