Changeset e45a565 in sasview for sansmodels/src/sans

Timestamp:

Apr 28, 2009 10:59:21 AM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

cdbe88e

Parents:

9be7432

Message:

removed singulars

File:

• sansmodels/src/sans/models/BEPolyelectrolyte.py (modified) (1 diff)

sansmodels/src/sans/models/BEPolyelectrolyte.py

@@ -88 +88 @@
         """
         Ca = self.params['c'] * 6.022136e-4
-        
-        K2 = 4.0 * math.pi * self.params['lb'] * (2*self.params['cs'] + \
-                 self.params['alpha'] * Ca)
-        
-        r02 = 1.0/self.params['alpha']/math.sqrt(Ca) * \
-                (self.params['b']/math.sqrt((48.0*math.pi *self.params['lb'])))
-        
-        return self.params['k']/( 4.0 * math.pi * self.params['lb'] * self.params['alpha']**2 ) \
-               * ( x**2 + K2 ) / ( 1.0 + r02**2 * ( x**2 + K2 ) \
-                    * (x**2 - ( 12.0 * self.params['h'] \
-                    * Ca/(self.params['b']**2) ))) \
-                    + self.params['background']
-        
+        #remove singulars
+        if self.params['alpha']<=0 or self.params['c']<=0 or self.params['b']==0 or self.params['lb']<=0:
+            return 0
+        else:
+            
+            K2 = 4.0 * math.pi * self.params['lb'] * (2*self.params['cs'] + \
+                     self.params['alpha'] * Ca)
+            
+            r02 = 1.0/self.params['alpha']/math.sqrt(Ca) * \
+                    (self.params['b']/math.sqrt((48.0*math.pi *self.params['lb'])))
+            
+            return self.params['k']/( 4.0 * math.pi * self.params['lb'] * self.params['alpha']**2 ) \
+                   * ( x**2 + K2 ) / ( 1.0 + r02**2 * ( x**2 + K2 ) \
+                        * (x**2 - ( 12.0 * self.params['h'] \
+                        * Ca/(self.params['b']**2) ))) \
+                        + self.params['background']
+            
    
     def run(self, x = 0.0):