Changeset 90e5ca1 in sasview

Timestamp:

Mar 17, 2010 9:01:04 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:

9ce7641c

Parents:

43e685d

Message:

modify invariant to get the fitted power
add another unittest that fail in both gui and computation

Location:

Invariant

Files:

• invariant.py (modified) (8 diffs)
• test/utest_use_cases.py (modified) (1 diff)

Invariant/invariant.py

@@ -362 +362 @@
         self._low_extrapolation_function = Guinier()
         self._low_extrapolation_power = None
+        self._low_extrapolation_power_fitted = None
    
         self._high_extrapolation_npts = 4
         self._high_extrapolation_function = PowerLaw()
         self._high_extrapolation_power = None
+        self._high_extrapolation_power_fitted = None
         
         # Extrapolation range
@@ -391 +393 @@
         return  new_data
      
-    def _fit(self, model, qmin=Q_MINIMUM, qmax=Q_MAXIMUM, power=None):
+    def _fit(self, model, qmin=Q_MINIMUM, qmax=Q_MAXIMUM, power=None, range=None):
         """
             fit data with function using 
@@ -408 +410 @@
         extrapolator = Extrapolator(data=self._data, model=model)
         p, dp = extrapolator.fit(power=power, qmin=qmin, qmax=qmax) 
+        if range is not None and range == 'low':
+            self._low_extrapolation_power_fitted = -1*p[0]
+        if range is not None and range == 'high':
+            self._high_extrapolation_power_fitted = -1*p[0]
         
         return model.extract_model_parameters(constant=p[1], slope=p[0], dconstant=dp[1], dslope=dp[0])
@@ -511 +517 @@
         return result_data
     
+    def get_extrapolation_power(self, range='high'):
+        """
+            return the fitted power for power law function at a givenr ange
+        """
+        if range == 'low':
+            return self._low_extrapolation_power_fitted
+        return self._high_extrapolation_power_fitted
+    
     def get_qstar_low(self):
         """
@@ -529 +543 @@
                          qmin=qmin,
                          qmax=qmax,
-                         power=self._low_extrapolation_power)
+                         power=self._low_extrapolation_power,
+                         range='low')
         
         # Distribution starting point
@@ -566 +581 @@
                          qmin=qmin,
                          qmax=qmax,
-                         power=self._high_extrapolation_power)
+                         power=self._high_extrapolation_power,
+                         range='high')
         
         #create new Data1D to compute the invariant
@@ -653 +669 @@
             self._high_extrapolation_npts  = npts
             self._high_extrapolation_power = power
+            self._high_extrapolation_power_fitted = power
         else:
             if function == 'power_law':
@@ -660 +677 @@
             self._low_extrapolation_npts  = npts
             self._low_extrapolation_power = power
+            self._low_extrapolation_power_fitted = power
         
     def get_qstar(self, extrapolation=None):

Invariant/test/utest_use_cases.py

@@ -237 +237 @@
         self.assertAlmostEquals(s , 941.7452, 3)
       
-  
+    def test_use_case_6(self):
+        """
+            Invariant with high-Q extrapolation
+        """
+        # Create invariant object. Background and scale left as defaults.
+        inv = invariant.InvariantCalculator(data=self.data)
+        
+        # Set the extrapolation parameters for the high-Q range
+        inv.set_extrapolation(range='low', npts=10, function='power_law', power=4)
+        
+        # The version of the call without error
+        # The function parameter defaults to None, then is picked to be 'power_law' for extrapolation='high'
+        qstar = inv.get_qstar(extrapolation='low')
+        
+        # The version of the call with error
+        qstar, qstar_err = inv.get_qstar_with_error(extrapolation='low')
+
+        # Get the volume fraction and surface
+        v, dv = inv.get_volume_fraction_with_error(contrast=2.6e-6)
+        s, ds = inv.get_surface_with_error(contrast=2.6e-6, porod_const=2)
+        
+        # Test results
+        self.assertAlmostEquals(qstar, 7.49e-5,2)
+        self.assertAlmostEquals(v, 0.005952674, 3)
+        self.assertAlmostEquals(s , 941.7452, 3)
+        
 class TestInvPinholeSmear(unittest.TestCase):
     """