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

Timestamp:

Mar 31, 2009 6:01:56 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

1328e03

Parents:

42c5acf

Message:

set_dispersion for model multiplication

File:

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

sansmodels/src/sans/models/MultiplicationModel.py

@@ -165 +165 @@
             @dispersion: dispersion object of type DispersionModel
         """
-        if parameter in self.model1.getParamList():
-            return self.model1.set_dispersion(parameter, dispersion)
-        else:
-            return self.model2.set_dispersion(parameter, dispersion)
-
+        value= None
+        try:
+            if parameter in self.model1.getParamList():
+                value= self.model1.set_dispersion(parameter, dispersion)
+            elif parameter in self.model2.ParamList():
+                value= self.model2.set_dispersion(parameter, dispersion)
+            return value
+        except:
+            raise