Changeset a55fac1 in sasview for sansmodels/src/sans/models

Timestamp:

Jun 10, 2008 11:27:07 AM (17 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:

38fc601

Parents:

06290c8

Message:

Modified 2D non-shape models to be the same as 1D when not defined otherwise

Location:

sansmodels/src/sans/models

Files:

• BEPolyelectrolyte.py (modified) (2 diffs)
• DABModel.py (modified) (2 diffs)
• DebyeModel.py (modified) (2 diffs)
• FractalModel.py (modified) (2 diffs)
• GuinierModel.py (modified) (2 diffs)
• LorentzModel.py (modified) (2 diffs)
• PorodModel.py (modified) (2 diffs)
• PowerLawModel.py (modified) (2 diffs)
• TeubnerStreyModel.py (modified) (2 diffs)
• test/utest_nonshape.py (modified) (11 diffs)

sansmodels/src/sans/models/BEPolyelectrolyte.py

@@ -94 +94 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._BEPoly(x[0]*math.cos(x[1]))*self._BEPoly(x[0]*math.sin(x[1]))
+            return self._BEPoly(x[0])
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -106 +106 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._BEPoly(x[0])*self._BEPoly(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._BEPoly(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/DABModel.py

@@ -57 +57 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._DAB(x[0]*math.cos(x[1]))*self._DAB(x[0]*math.sin(x[1]))
+            return self._DAB(x[0])
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -69 +69 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._DAB(x[0])*self._DAB(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._DAB(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/DebyeModel.py

@@ -64 +64 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._debye(x[0]*math.cos(x[1]))*self._debye(x[0]*math.sin(x[1]))
+            return self._debye(x[0])
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -76 +76 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._debye(x[0])*self._debye(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._debye(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/FractalModel.py

@@ -99 +99 @@
             # Take absolute value of Q, since this model is really meant to
             # be defined in 1D for a given length of Q
-            qx = math.fabs(x[0]*math.cos(x[1]))
-            qy = math.fabs(x[0]*math.sin(x[1]))
+            #qx = math.fabs(x[0]*math.cos(x[1]))
+            #qy = math.fabs(x[0]*math.sin(x[1]))
             
-            return self._Fractal(qx)*self._Fractal(qy)
+            return self._Fractal(math.fabs(x[0]))
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -114 +114 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._Fractal(x[0])*self._Fractal(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._Fractal(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/GuinierModel.py

@@ -48 +48 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._guinier(x[0]*math.cos(x[1]))*self._guinier(x[0]*math.sin(x[1]))
+            return self._guinier(x[0])
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -60 +60 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._guinier(x[0])*self._guinier(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._guinier(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/LorentzModel.py

@@ -57 +57 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._lorentz(x[0]*math.cos(x[1]))*self._lorentz(x[0]*math.sin(x[1]))
+            return self._lorentz(x[0])
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -69 +69 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._lorentz(x[0])*self._lorentz(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._lorentz(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/PorodModel.py

@@ -45 +45 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._porod(x[0]*math.cos(x[1]))*self._porod(x[0]*math.sin(x[1]))
+            return self._porod(x[0])
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -57 +57 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._porod(x[0])*self._porod(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._porod(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/PowerLawModel.py

@@ -61 +61 @@
             # Take absolute value of Q, since this model is really meant to
             # be defined in 1D for a given length of Q
-            qx = math.fabs(x[0]*math.cos(x[1]))
-            qy = math.fabs(x[0]*math.sin(x[1]))
-            return self._PowerLaw(qx)*self._PowerLaw(qy)
+            #qx = math.fabs(x[0]*math.cos(x[1]))
+            #qy = math.fabs(x[0]*math.sin(x[1]))
+            return self._PowerLaw(math.fabs(x[0]))
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -75 +75 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._PowerLaw(x[0])*self._PowerLaw(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._PowerLaw(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/TeubnerStreyModel.py

@@ -62 +62 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._TeubnerStrey(x[0]*math.cos(x[1]))\
-             *self._TeubnerStrey(x[0]*math.sin(x[1]))
+            return self._TeubnerStrey(x[0])
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"
@@ -75 +74 @@
         """
         if x.__class__.__name__ == 'list':
-            return self._TeubnerStrey(x[0])*self._TeubnerStrey(x[1])
+            q = math.sqrt(x[0]**2 + x[1]**2)
+            return self._TeubnerStrey(q)
         elif x.__class__.__name__ == 'tuple':
             raise ValueError, "Tuples are not allowed as input to BaseComponent models"

sansmodels/src/sans/models/test/utest_nonshape.py

@@ -42 +42 @@
         self.model.setParam('rg', 1.0)
         
-        value = self._func(2.0, 1.0, 1.0)*self._func(2.0, 1.0, 2.0)
-        self.assertEqual(self.model.runXY([0.0,0.0]), 2.0*2.0)
+        #value = self._func(2.0, 1.0, 1.0)*self._func(2.0, 1.0, 2.0)
+        value = self._func(2.0, 1.0, math.sqrt(5.0))
+        #self.assertEqual(self.model.runXY([0.0,0.0]), 2.0*2.0)
+        self.assertEqual(self.model.runXY([0.0,0.0]), 2.0)
         self.assertEqual(self.model.runXY([1.0,2.0]), value)
         
@@ -55 +57 @@
         phi = math.atan2(y, x)
         
-        value = self._func(2.0, 1.0, x)*self._func(2.0, 1.0, y)
+        #value = self._func(2.0, 1.0, x)*self._func(2.0, 1.0, y)
+        value = self._func(2.0, 1.0, r)
         
         #self.assertEqual(self.model.run([r, phi]), value)
@@ -83 +86 @@
         
     def test2D(self):
-        value = self._func(2.0, 1.0)*self._func(2.0, 2.0)
-        self.assertEqual(self.model.runXY([1.0,2.0]), value)
-        
-    def test2Dphi(self):
-        x = 1.0
-        y = 2.0
-        r = math.sqrt(x**2 + y**2)
-        phi = math.atan2(y, x)
-        
-        value = self._func(2.0, 1.0)*self._func(2.0, 2.0)
+        #value = self._func(2.0, 1.0)*self._func(2.0, 2.0)
+        value = self._func(2.0, math.sqrt(5.0))
+        self.assertEqual(self.model.runXY([1.0,2.0]), value)
+        
+    def test2Dphi(self):
+        x = 1.0
+        y = 2.0
+        r = math.sqrt(x**2 + y**2)
+        phi = math.atan2(y, x)
+        
+        #value = self._func(2.0, 1.0)*self._func(2.0, 2.0)
+        value = self._func(2.0, r)
         self.assertAlmostEquals(self.model.run([r, phi]), value,1)
         
@@ -127 +132 @@
         
     def test2D(self):
-        value = self._func(50.0, 1.0, 0.001, 1.0)*self._func(50.0, 1.0, 0.001, 2.0)
+        #value = self._func(50.0, 1.0, 0.001, 1.0)*self._func(50.0, 1.0, 0.001, 2.0)
+        value = self._func(50.0, 1.0, 0.001, math.sqrt(5.0))
         self.assertEqual(self.model.runXY([1.0,2.0]), value)
         
@@ -172 +178 @@
         self.model.setParam('background', 1.0)
         
-        value = self._func(100.0, 50.0, 1.0, 1.0)*self._func(100.0, 50.0, 1.0, 2.0)    
+        #value = self._func(100.0, 50.0, 1.0, 1.0)*self._func(100.0, 50.0, 1.0, 2.0)    
+        value = self._func(100.0, 50.0, 1.0, math.sqrt(5.0))  
         self.assertEqual(self.model.runXY([1.0,2.0]), value)
         
@@ -220 +227 @@
         
     def test2D(self):
-        value = self._func(self.scale, self.length, self.back, 1.0)*self._func(self.scale, self.length, self.back, 2.0)    
+        #value = self._func(self.scale, self.length, self.back, 1.0)*self._func(self.scale, self.length, self.back, 2.0)    
+        value = self._func(self.scale, self.length, self.back, math.sqrt(5.0))
         self.assertEqual(self.model.runXY([1.0,2.0]), value)
         
@@ -272 +280 @@
         self.model.setParam('background', 1.0)
         
-        value = self._func(math.exp(-6), 4.0, 1.0, 1.0)\
-        *self._func(math.exp(-6), 4.0, 1.0, 2.0)    
+        #value = self._func(math.exp(-6), 4.0, 1.0, 1.0)\
+        #*self._func(math.exp(-6), 4.0, 1.0, 2.0)    
+        value = self._func(math.exp(-6), 4.0, 1.0, math.sqrt(5.0))
         
         self.assertEqual(self.model.runXY([1.0,2.0]), value)
@@ -332 +341 @@
         self.model.setParam('scale', 0.1)
         self.model.setParam('background', 0.1)
-        value = self._func(0.1,-30.0,5000.0,0.1, 1.0)\
-        *self._func(0.1,-30.0,5000.0,0.1, 2.0)    
+        #value = self._func(0.1,-30.0,5000.0,0.1, 1.0)\
+        #*self._func(0.1,-30.0,5000.0,0.1, 2.0)    
+        value = self._func(0.1,-30.0,5000.0,0.1, math.sqrt(5.0))
         
         self.assertEqual(self.model.runXY([1.0,2.0]), value)
@@ -348 +358 @@
         phi = math.atan2(y, x)
         
-        value = self._func(0.1,-30.0,5000.0,0.1, x)\
-        *self._func(0.1,-30.0,5000.0,0.1, y)
+        #value = self._func(0.1,-30.0,5000.0,0.1, x)\
+        #*self._func(0.1,-30.0,5000.0,0.1, y)
+        value = self._func(0.1,-30.0,5000.0,0.1, r)
         self.assertAlmostEquals(self.model.run([r, phi]), value,1)
         
@@ -415 +426 @@
          
     def test2D(self):
-        self.assertAlmostEquals(self.model.runXY([1.0,2.0]), self._func(1.0)*self._func(2.0), 8)
-        
-    def test2Dphi(self):
-
-        x = 1.0
-        y = 2.0
-        r = math.sqrt(x**2 + y**2)
-        phi = math.atan2(y, x)
-        
-        self.assertAlmostEquals(self.model.run([r, phi]), self._func(x)*self._func(y), 8)
+        #self.assertAlmostEquals(self.model.runXY([1.0,2.0]), self._func(1.0)*self._func(2.0), 8)
+        self.assertAlmostEquals(self.model.runXY([1.0,2.0]), self._func(math.sqrt(1.0+2.0**2)), 8)
+        
+    def test2Dphi(self):
+
+        x = 1.0
+        y = 2.0
+        r = math.sqrt(x**2 + y**2)
+        phi = math.atan2(y, x)
+        
+        self.assertAlmostEquals(self.model.run([r, phi]), self._func(r), 8)
         
 class TestFractalModel(unittest.TestCase):
@@ -493 +505 @@
         iq_y = self._func(y)
         
-        self.assertEqual(self.model.run([r, phi]), iq_x*iq_y)
-        self.assertEqual(self.model.runXY([x,y]), iq_x*iq_y)
+        #self.assertEqual(self.model.run([r, phi]), iq_x*iq_y)
+        self.assertEqual(self.model.run([r, phi]), self.model.run(r))
+        #self.assertEqual(self.model.runXY([x,y]), iq_x*iq_y)
+        self.assertEqual(self.model.runXY([x,y]), self.model.run(r))
         
 if __name__ == '__main__':