Changeset 3ee4d96 in sasview for sansmodels

Timestamp:

Apr 18, 2012 12:54:57 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:

279e371

Parents:

9e91546

Message:

Fixing code style problems

File:

• sansmodels/src/sans/models/DABModel.py (modified) (4 diffs)

sansmodels/src/sans/models/DABModel.py

@@ -29 +29 @@
         ## Name of the model
         self.name = "DAB_Model"
-        self.description="""F(x) = scale*(L^3)/( 1 + (x*L)^2 )^(2) + background
+        self.description = """
+        F(x) = scale*(L^3)/( 1 + (x*L)^2 )^(2) + background
         
         The model has three parameters: 
@@ -47 +48 @@
         self.details['background']        = ['[1/cm]', None, None]
         #list of parameter that cannot be fitted
-        self.fixed= []      
+        self.fixed = []   
+           
     def _DAB(self, x):
         """
             Evaluate  F(x) = (scale*L^3)/( 1 + (x*L)^2 )^(2) + background
-           
         """
-        # According to SRK (Igor/NIST code: 6 JUL 2009  changed definition of 'scale' to be uncorrelated with 'length')
-        return self.params['scale']*math.pow(self.params['length'],3)/math.pow(( 1 + math.pow(x * self.params['length'],2)),2) \
-         + self.params['background']
-       
+        # According to SRK (Igor/NIST code: 6 JUL 2009 changed definition 
+        # of 'scale' to be uncorrelated with 'length')
+        return self.params['scale']*math.pow(self.params['length'], 3)/\
+            math.pow(( 1 + math.pow(x * self.params['length'], 2)), 2) \
+            + self.params['background']
    
     def run(self, x = 0.0):
@@ -66 +68 @@
             return self._DAB(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._DAB(x)
@@ -79 +81 @@
             return self._DAB(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._DAB(x)