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

sansmodels/src/sans/models/FractalCoreShellModel.py

@@ -131 +131 @@
             if name  == 'scale':
                 name = 'volfraction'
-            self.params[name]= value
+            self.params[name] = value
         self.params['frac_dim'] = 2.0
         self.params['cor_length'] = 100.0  
@@ -206 +206 @@
                 +self._fractalcore(x[0])*self.model.run(x)
         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.params['background']\
@@ -222 +222 @@
         if x.__class__.__name__ == 'list':
             q = math.sqrt(x[0]**2 + x[1]**2)
-            return self.params['background']+self._fractalcore(q)*self.model.runXY(x)
+            return self.params['background']\
+                +self._fractalcore(q)*self.model.runXY(x)
         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.params['background']+self._fractalcore(x)*self.model.runXY(x)
-
+            return self.params['background']\
+                +self._fractalcore(x)*self.model.runXY(x)
 
     def set_dispersion(self, parameter, dispersion):