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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/MultiplicationModel.py

    r4d0d5b1 ra8a55f2  
    158158        if value != None:  
    159159            factor = self.p_model.calculate_VR() 
    160             if factor == 0.0 or factor == None or factor == NotImplemented: 
     160            if factor == None or factor == NotImplemented or factor == 0.0: 
    161161                val= value 
    162162            else: 
    163163                val = value / factor 
    164             self.p_model.setParam( 'scale', value) 
    165             self.s_model.setParam( 'volfraction', val) 
     164            self.p_model.setParam('scale', value) 
     165            self.s_model.setParam('volfraction', val) 
    166166             
    167167    def _set_effect_radius(self): 
Note: See TracChangeset for help on using the changeset viewer.