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

Timestamp:

Feb 29, 2012 8:48:08 AM (13 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:

2d6f1f1

Parents:

6319646

Message:

c models fix: scale fix for P*S

Location:

sansmodels/src/sans/models

Files:

• BaseComponent.py (modified) (1 diff)
• MultiplicationModel.py (modified) (1 diff)

sansmodels/src/sans/models/BaseComponent.py

@@ -69 +69 @@
     def runXY(self, x): return NotImplemented  
     def calculate_ER(self): return NotImplemented  
+    def calculate_VR(self): return NotImplemented 
     def evalDistribution(self, qdist):
         """

sansmodels/src/sans/models/MultiplicationModel.py

@@ -157 +157 @@
         value = self.params['volfraction']
         if value != None: 
-            self.p_model.setParam( 'scale', value)
+            factor = self.p_model.calculate_VR()
+            val = factor * value
+            self.p_model.setParam( 'scale', val)