Changeset a55fac1 in sasview for sansmodels/src/sans/models/FractalModel.py

Timestamp:

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

File:

• sansmodels/src/sans/models/FractalModel.py (modified) (2 diffs)

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"