Changeset 06c7fcc in sasview for sansmodels/src/sans

Timestamp:

May 27, 2010 9:13:41 AM (14 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:

2f1a0dc

Parents:

c6a48c27

Message:

now uses runXY method in C, not in BaseComponent? which is very slow.

File:

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

sansmodels/src/sans/models/MultiplicationModel.py

@@ -213 +213 @@
         self._set_scale_factor()
         return self.params['scale_factor']*self.p_model.runXY(x)* self.s_model.runXY(x)
+    
+    ## Now (May27,10) directly uses the model eval function 
+    ## instead of the for-loop in Base Component.
+    def evalDistribution(self, x = []):
+        """ Evaluate the model in cartesian coordinates
+            @param x: input q[], or [qx[], qy[]]
+            @return: scattering function P(q[])
+        """
+        # set effective radius and scaling factor before run
+        self._set_effect_radius()
+        self._set_scale_factor()
+        return self.params['scale_factor']*self.p_model.evalDistribution(x)* self.s_model.evalDistribution(x)
 
     def set_dispersion(self, parameter, dispersion):