Changeset 8077fc4 in sasview for sansmodels/src

Timestamp:

Apr 27, 2009 6:14:35 PM (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:

3ba03a4c

Parents:

6963aa3

Message:

fixed the dispersion problem in P*S

File:

• sansmodels/src/sans/models/MultiplicationModel.py (modified) (3 diffs)

sansmodels/src/sans/models/MultiplicationModel.py

@@ -8 +8 @@
 class MultiplicationModel(BaseComponent):
     """
-        Use for S(Q)*P(Q).
+        Use for P(Q)*S(Q); function call maut be in order of P(Q) and then S(Q).
         Perform multplication of two models.
         Contains the models parameters combined.
@@ -97 +97 @@
             
         for name , value in self.model2.dispersion.iteritems():
-            if not name in self.dispersion.keys()and name !='radius':
+            # S(Q) has only 'radius' for dispersion.
+            if not name in self.dispersion.keys()and name !='radius': 
                 self.dispersion[name]= value
 
@@ -235 +236 @@
             if parameter in self.model1.dispersion.keys():
                 value= self.model1.set_dispersion(parameter, dispersion)
-              
-            elif parameter in self.model2.dispersion.keys():
+            #There is no dispersion for the structure factors(S(Q)). 
+            #ToDo: need to decide whether or not the dispersion for S(Q) has to be considered for P*S.  
+            elif parameter in self.model2.dispersion.keys()and name !='radius':
                 value= self.model2.set_dispersion(parameter, dispersion)
+            self._set_dispersion()
             return value
         except: