Changeset 279e371 in sasview for sansmodels/src/sans/models/GuinierPorodModel.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/GuinierPorodModel.py (modified) (6 diffs)

sansmodels/src/sans/models/GuinierPorodModel.py

@@ -1 @@
-#!/usr/bin/env python
 """ 
-I(q) = scale/q^s* exp ( - R_g^2 q^2 / (3-s) ) for q<= ql
-    = scale/q^m*exp((-ql^2*Rg^2)/(3-s))*ql^(m-s) for q>=ql
-Guinier function as a BaseComponent model
+    I(q) = scale/q^s* exp ( - R_g^2 q^2 / (3-s) ) for q<= ql
+        = scale/q^m*exp((-ql^2*Rg^2)/(3-s))*ql^(m-s) for q>=ql
+    Guinier function as a BaseComponent model
 """
-
 from sans.models.BaseComponent import BaseComponent
 from math import sqrt,exp
@@ -24 +22 @@
         ## Name of the model
         self.name = "GuinierPorod"
-        self.description=""" I(q) = scale/q^s* exp ( - R_g^2 q^2 / (3-s) ) for q<= ql
+        self.description = """
+         I(q) = scale/q^s* exp ( - R_g^2 q^2 / (3-s) ) for q<= ql
          = scale/q^m*exp((-ql^2*Rg^2)/(3-s))*ql^(m-s) for q>=ql
                         where ql = sqrt((m-s)(3-s)/2)/Rg.
@@ -49 +48 @@
 
         #list of parameter that cannot be fitted
-        self.fixed= []  
+        self.fixed = []  
         
     def _guinier_porod(self, x):
@@ -65 +64 @@
         
         #do the calculation and return the function value
-        q1=sqrt((n-3.0+m)*n/2.0)/Rg
+        q1 = sqrt((n-3.0+m)*n/2.0)/Rg
         if qval < q1:
             F = (G/pow(qval,(3.0-n)))*exp((-qval*qval*Rg*Rg)/n) 
         else:
-            F = (G/pow(qval,m))*exp(-(n-3.0+m)/2.0)*pow(((n-3.0+m)*n/2.0),
+            F = (G/pow(qval, m))*exp(-(n-3.0+m)/2.0)*pow(((n-3.0+m)*n/2.0),
                                         ((n-3.0+m)/2.0))/pow(Rg,(n-3.0+m))
         inten = F + bgd
@@ -83 +82 @@
             return self._guinier_porod(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_porod(x)
@@ -96 +95 @@
             return self._guinier_porod(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_porod(x)