Changeset 279e371 in sasview for sansmodels/src/sans/models/GuinierModel.py

Timestamp:

Apr 18, 2012 1:26:13 PM (12 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:

499fe7a

Parents:

3ee4d96

Message:

Fixing code style problems

File:

• sansmodels/src/sans/models/GuinierModel.py (modified) (5 diffs)

sansmodels/src/sans/models/GuinierModel.py

@@ -1 @@
-#!/usr/bin/env python
 """ 
     Provide I(q) = I_0 exp ( - R_g^2 q^2 / 3.0)
     Guinier function as a BaseComponent model
 """
-
 from sans.models.BaseComponent import BaseComponent
 import math
@@ -28 +26 @@
         ## Name of the model
         self.name = "Guinier"
-        self.description=""" I(q) = I_0 exp ( - R_g^2 q^2 / 3.0 )
+        self.description = """ I(q) = I_0 exp ( - R_g^2 q^2 / 3.0 )
         
                         List of default parameters:
@@ -43 +41 @@
         self.details['rg']    = ['[A]', None, None]
         #list of parameter that cannot be fitted
-        self.fixed= []  
+        self.fixed = []  
+        
     def _guinier(self, x):
-        return self.params['scale'] * math.exp( -(self.params['rg']*x)**2 / 3.0 )  
+        """
+            Evaluate guinier function
+            :param x: q-value
+        """
+        return self.params['scale']*math.exp( -(self.params['rg']*x)**2/3.0 )  
    
     def run(self, x = 0.0):
-        """ Evaluate the model
+        """ 
+            Evaluate the model
             @param x: input q-value (float or [float, float] as [r, theta])
             @return: (guinier value)
@@ -55 +59 @@
             return self._guinier(x[0])
         elif x.__class__.__name__ == 'tuple':
-            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError, "Tuples are not allowed as input to models"
         else:
             return self._guinier(x)
@@ -68 +72 @@
             return self._guinier(q)
         elif x.__class__.__name__ == 'tuple':
-            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError, "Tuples are not allowed as input to models"
         else:
             return self._guinier(x)