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

Timestamp:

Feb 29, 2012 4:20:56 PM (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:

02bdfc5

Parents:

4d0d5b1

Message:

minor change: reorder the if statement

File:

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

sansmodels/src/sans/models/MultiplicationModel.py

@@ -158 +158 @@
         if value != None: 
             factor = self.p_model.calculate_VR()
-            if factor == 0.0 or factor == None or factor == NotImplemented:
+            if factor == None or factor == NotImplemented or factor == 0.0:
                 val= value
             else:
                 val = value / factor
-            self.p_model.setParam( 'scale', value)
-            self.s_model.setParam( 'volfraction', val)
+            self.p_model.setParam('scale', value)
+            self.s_model.setParam('volfraction', val)
             
     def _set_effect_radius(self):