Changeset 31f9d0c2 in sasview for sansmodels/src

Timestamp:

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

7fb69f26

Parents:

7343319

Message:

Fixing code style problems

File:

• sansmodels/src/sans/models/FractalCoreShellModel.py (modified) (9 diffs)

sansmodels/src/sans/models/FractalCoreShellModel.py

@@ -1 @@
-   
+"""
+    Fractal Core-Shell model
+"""
 from sans.models.BaseComponent import BaseComponent
 from sans.models.CoreShellModel import CoreShellModel
 from scipy.special import gammaln
-from math import exp, sin, atan
+import math
 from numpy import power
 from copy import deepcopy
@@ -26 +28 @@
         ## Setting  model name model description
         model = CoreShellModel()
-        self.description=model
+        self.description = model
         
         self.model = model
         self.name = "FractalCoreShell"
-        self.description="""Scattering  from a fractal structure 
+        self.description = """Scattering  from a fractal structure 
         with a primary building block of a spherical particle 
         with particle with a core-shell structure.
@@ -64 +66 @@
         self._set_details()
 
-        ## parameters with orientation: can be removed since there is no orientational params
+        ## parameters with orientation:
         for item in self.model.orientation_params:
             self.orientation_params.append(item)
                 
-    def _fractalcore(self,x):
+    def _fractalcore(self, x):
         """
         Define model function
@@ -79 +81 @@
         r0 = self.params['radius']
         #calculate S(q)
-        sq = Df*exp(gammaln(Df-1.0))*sin((Df-1.0)*atan(x*corr))
-        sq /= power((x*r0),Df) * power((1.0 + 1.0/(x*corr*x*corr)),((Df-1)/2))
+        sq = Df*math.exp(gammaln(Df-1.0))*math.sin((Df-1.0)*math.atan(x*corr))
+        sq /= power((x*r0), Df) * power((1.0 + 1.0/(x*corr*x*corr)), ((Df-1)/2))
         sq += 1.0
         return sq
@@ -103 +105 @@
         ##set dispersion from model 
         for name , value in self.model.dispersion.iteritems():      
-            self.dispersion[name]= value
+            self.dispersion[name] = value
                               
     def _set_params(self):
@@ -126 +128 @@
             elif name == 'background':
                 value = 0.0
-            self.model.params[name]= value
+            self.model.params[name] = value
             if name  == 'scale':
                 name = 'volfraction'
@@ -138 +140 @@
         this model details 
         """
-        for name ,detail in self.model.details.iteritems():
+        for name, detail in self.model.details.iteritems():
             if name in self.params.iterkeys():
                 if name == 'scale':
                     name = 'volfraction'
-                self.details[name]= detail
+                self.details[name] = detail
         self.details['frac_dim']   = ['', None, None]
         self.details['cor_length'] = ['[A]', None, None]  
@@ -201 +203 @@
             #qx = math.fabs(x[0]*math.cos(x[1]))
             #qy = math.fabs(x[0]*math.sin(x[1]))
-            return self.params['background']+self._fractalcore(x[0])*self.model.run(x)
+            return self.params['background']\
+                +self._fractalcore(x[0])*self.model.run(x)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
         else:
-            return self.params['background']+self._fractalcore(x)*self.model.run(x)
-
+            return self.params['background']\
+                +self._fractalcore(x)*self.model.run(x)
 
         return self.params['background']+self._fractalcore(x)*self.model.run(x)
@@ -233 +236 @@
         :dispersion: dispersion object of type DispersionModel
         """
-        value= None
+        value = None
         try:
             if parameter in self.model.dispersion.keys():
-                value= self.model.set_dispersion(parameter, dispersion)
+                value = self.model.set_dispersion(parameter, dispersion)
             self._set_dispersion()
             return value