Changeset edb3a5d0 in sasview for calculator/sld_calculator.py

Timestamp:

Jun 11, 2010 10:54:30 AM (14 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:

d0d7704

Parents:

9afd369

Message:

hiding button

File:

• calculator/sld_calculator.py (modified) (3 diffs)

calculator/sld_calculator.py

@@ -36 +36 @@
         #Inputs
         self.wavelength  = 6.0
-        self.sld_formula = None
+        self.sld_formula = ""
         self.density = None
         #Outputs
@@ -46 +46 @@
         self.length = 0.0
         
-    def set_value(self, formula, density, wavelength=6.0):
+    def set_value(self, user_formula, density, wavelength=6.0):
         """
         Store values into the sld calculator and compute the corresponding
@@ -53 +53 @@
         self.wavelength = wavelength
         self.density    = float(density)
-        self.sld_formula = formula(str(formula), density=self.density)
+        self.sld_formula = formula(str(user_formula), density=self.density)
        
         if self.density == 0: