Changeset 1702180 in sasview

Timestamp:

Jan 22, 2010 2:57:57 PM (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:

bb0b12c

Parents:

1a2dc10

Message:

add comment for 2 methods

File:

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

Invariant/invariant.py

@@ -37 +37 @@
             dy = data.dy
         else:
-            dy = numpy.array([math.sqrt(math.fabs(j)) for j in data.y])
+            #dy = numpy.array([math.sqrt(math.fabs(j)) for j in data.y])
+            dy = numpy.array([1 for j in data.y])
         # Transform smear info 
         dxl_out = None
@@ -266 +267 @@
 
          # Uncertainty
-        if type(self.data.dy)==numpy.ndarray and len(self.data.dy)==len(self.data.x):
+        if type(self.data.dy)==numpy.ndarray and len(self.data.dy)==len(self.data.x)and self.data.dy[0] != 0:
             sigma = self.data.dy
         else:
@@ -346 +347 @@
             raise ValueError,"Data must be of type DataLoader.Data1D"
         new_data = (self._scale * data) - self._background   
+        new_data.dy[new_data.dy==0] = 1
         new_data.dxl = data.dxl
         new_data.dxw = data.dxw 
@@ -730 +732 @@
     def get_extra_data_low(self, npts_in=None, q_start=Q_MINIMUM, nsteps=INTEGRATION_NSTEPS):
         """
-            This method creates a new data set from the invariant calculator.
-            
-            It will use the extrapolation parameters kept as private data members.
-            
-            self._low_extrapolation_npts is the number of data points to use in to fit.
-            self._low_extrapolation_function will be used as the fit function.
-            
-            
-            
-            It takes npts first points of data, fits them with a given model
-            then uses the new parameters resulting from the fit to create a new data set.
-            
-            The new data first point is Q_MINIMUM.
-            
-            The last point of the new data is the first point of the original data.
-            the number of q points of this data is INTEGRATION_NSTEPS.
-            
-            @return: a new data of type Data1D
+           This method generates 2 data sets , the first is a data created during 
+           low extrapolation . its y is generated from x in [ Q_MINIMUM - the minimum of
+           data.x] and the outputs of the extrapolator .
+            (data is the data used to compute invariant) 
+           the second is also data produced during the fit but the x range considered
+           is within the reel range of data x.
+           x uses is in [minimum of data.x up to npts_in points]
+           @param npts_in: the number of first points of data to consider  for computing
+           y's coming out of the fit.
+           @param q_start: is the minimum value to uses for extrapolated data
+           @param npts: the number of point used to create extrapolated data 
+           
         """
         #Create a data from result of the fit for a range outside of the data
@@ -794 +790 @@
     def get_extra_data_high(self, npts_in=None, q_end=Q_MAXIMUM, nsteps=INTEGRATION_NSTEPS ):
         """
-            This method creates a new data from the invariant calculator.
-            
-            It takes npts last points of data, fits them with a given model
-            (for this function only power_law will be use), then uses
-            the new parameters resulting from the fit to create a new data set.
-            The first point is the last point of data.
-            The last point of the new data is Q_MAXIMUM.
-            The number of q points of this data is INTEGRATION_NSTEPS.
-
-            
-            @return: a new data of type Data1D
+           This method generates 2 data sets , the first is a data created during 
+           low extrapolation . its y is generated from x in [ the maximum of
+           data.x to  Q_MAXIMUM] and the outputs of the extrapolator .
+            (data is the data used to compute invariant) 
+           the second is also data produced during the fit but the x range considered
+           is within the reel range of data x.
+           x uses is from maximum of data.x up to npts_in points before data.x maximum.
+           @param npts_in: the number of first points of data to consider  for computing
+           y's coming out of the fit.
+           @param q_end: is the maximum value to uses for extrapolated data
+           @param npts: the number of point used to create extrapolated data 
+           
         """
         #Create a data from result of the fit for a range outside of the data