Changeset 4d0d5b1 in sasview for sansmodels/src/sans/models

Timestamp:

Feb 29, 2012 2:08:14 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:

a8a55f2

Parents:

2d6f1f1

Message:

removed print statement and fixed minor bug

File:

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

sansmodels/src/sans/models/MultiplicationModel.py

@@ -158 +158 @@
         if value != None: 
             factor = self.p_model.calculate_VR()
-            if factor == 0.0:
+            if factor == 0.0 or factor == None or factor == NotImplemented:
                 val= value
             else:
@@ -244 +244 @@
         self._set_effect_radius()
         self._set_scale_factor()
-        print "scal=", self.p_model.params['scale']
-        print "volf=", self.s_model.params['volfraction']
         return self.params['scale_factor']*self.p_model.run(x)*self.s_model.run(x)
 
@@ -256 +254 @@
         self._set_effect_radius()
         self._set_scale_factor()
-        print "scal=", self.p_model.params['scale']
-        print "volf=", self.s_model.params['volfraction']
         return self.params['scale_factor']*self.p_model.runXY(x)* self.s_model.runXY(x)
     
@@ -270 +266 @@
         self._set_effect_radius()
         self._set_scale_factor()
-        print "scal=", self.p_model.params['scale']
-        print "volf=", self.s_model.params['volfraction']
         return self.params['scale_factor']*self.p_model.evalDistribution(x)* self.s_model.evalDistribution(x)