Changeset cb4ef58 in sasview for src/sas/sascalc

Timestamp:

Apr 13, 2016 7:23:07 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

16b769b

Parents:

fa4ea80

Message:

remove references to internal _model_info attribute from sasview

Location:

src/sas/sascalc

Files:

• calculator/BaseComponent.py (modified) (1 diff)
• calculator/sas_gen.py (modified) (1 diff)
• fit/MultiplicationModel.py (modified) (3 diffs)

src/sas/sascalc/calculator/BaseComponent.py

@@ -50 +50 @@
         self.output_unit = "cm^{-1}"
 
+        self.is_multiplicity_model = False
+        self.is_structure_factor = False
+        self.is_form_factor = False
+
     def __str__(self):
         """

src/sas/sascalc/calculator/sas_gen.py

@@ -80 +80 @@
         ## Parameter details [units, min, max]
         self.details = {}
-        self.details['scale'] = ['', None, None]
-        self.details['background'] = ['[1/cm]', None, None]
-        self.details['solvent_SLD'] = ['1/A^(2)', None, None]
-        self.details['total_volume'] = ['A^(3)', None, None]
-        self.details['Up_frac_in'] = ['[u/(u+d)]', None, None]
-        self.details['Up_frac_out'] = ['[u/(u+d)]', None, None]
-        self.details['Up_theta'] = ['[deg]', None, None]
+        self.details['scale'] = ['', 0.0, numpy.inf]
+        self.details['background'] = ['[1/cm]', 0.0, numpy.inf]
+        self.details['solvent_SLD'] = ['1/A^(2)', -numpy.inf, numpy.inf]
+        self.details['total_volume'] = ['A^(3)', 0.0, numpy.inf]
+        self.details['Up_frac_in'] = ['[u/(u+d)]', 0.0, 1.0]
+        self.details['Up_frac_out'] = ['[u/(u+d)]', 0.0, 1.0]
+        self.details['Up_theta'] = ['[deg]', -numpy.inf, numpy.inf]
         # fixed parameters
         self.fixed = []

src/sas/sascalc/fit/MultiplicationModel.py

@@ +1 @@
+import copy
+
+import numpy
 
 from sas.sascalc.calculator.BaseComponent import BaseComponent
-#import numpy, math
-import copy
-from sas.sascalc.fit.pluginmodel import Model1DPlugin
+
 class MultiplicationModel(BaseComponent):
     r"""
@@ -47 +48 @@
         ## Parameter details [units, min, max]
         self._set_details()
-        self.details['scale_factor'] = ['',     None, None]
+        self.details['scale_factor'] = ['', 0.0, numpy.inf]
         
         #list of parameter that can be fitted
@@ -75 +76 @@
                 self.multiplicity_info = p_model.multiplicity_info 
                 self.fun_list = p_model.fun_list
+                self.is_multiplicity_model = True
             except:
                 pass
         else:
-            self.multiplicity_info = []
+            self.is_multiplicity_model = False
+            self.multiplicity_info = [0]
             
     def _clone(self, obj):