Changeset c080c943 in sasview for src/sas/sascalc

Timestamp:

Mar 31, 2019 1:29:02 PM (6 years ago)

Author:

GitHub <noreply@…>

Parents:

fa307dd (diff), e66f9c1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (03/31/19 13:29:02)

git-committer:

GitHub <noreply@…> (03/31/19 13:29:02)

Message:

Merge e66f9c1f0e64eb3f2bd4e989067361257af0d83a into fa307ddb8d25a41b44c02bd525f9727d5b4b7e5b

Location:

src/sas/sascalc

Files:

• dataloader/readers/cansas_reader.py (modified) (1 diff)
• fit/BumpsFitting.py (modified) (5 diffs)
• fit/fitstate.py (added)
• fit/pagestate.py (modified) (3 diffs)
• fit/expression.py (modified) (4 diffs)

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -493 +493 @@
                 self.current_datainfo.errors.add(error)
             self.data_cleanup()
-            self.sort_one_d_data()
-            self.sort_two_d_data()
+            self.sort_data()
             self.reset_data_list()
             return self.output[0], None

src/sas/sascalc/fit/BumpsFitting.py

@@ -2 +2 @@
 BumpsFitting module runs the bumps optimizer.
 """
+from __future__ import print_function
+
 import os
 from datetime import timedelta, datetime
@@ -9 +11 @@
 
 from bumps import fitters
+
 try:
     from bumps.options import FIT_CONFIG
+    # Preserve bumps default fitter in case someone wants it later
+    BUMPS_DEFAULT_FITTER = FIT_CONFIG.selected_id
     # Default bumps to use the Levenberg-Marquardt optimizer
     FIT_CONFIG.selected_id = fitters.LevenbergMarquardtFit.id
@@ -17 +22 @@
 except ImportError:
     # CRUFT: Bumps changed its handling of fit options around 0.7.5.6
+    # Preserve bumps default fitter in case someone wants it later
+    BUMPS_DEFAULT_FITTER = fitters.FIT_DEFAULT
     # Default bumps to use the Levenberg-Marquardt optimizer
     fitters.FIT_DEFAULT = 'lm'
@@ -126 +133 @@
         if initial_values is not None:
             self._reset_pars(fitted, initial_values)
+        #print("constraints", constraints)
         self.constraints = dict(constraints)
         self.set_fitted(fitted)
@@ -222 +230 @@
     def _setup(self):
         exprs = {}
-        for M in self.models:
-            exprs.update((".".join((M.name, k)), v) for k, v in M.constraints.items())
+        for model in self.models:
+            exprs.update((".".join((model.name, k)), v)
+                         for k, v in model.constraints.items())
         if exprs:
-            symtab = dict((".".join((M.name, k)), p)
-                          for M in self.models
-                          for k, p in M.parameters().items())
+            symtab = dict((".".join((model.name, k)), p)
+                          for model in self.models
+                          for k, p in model.parameters().items())
             self.update = compile_constraints(symtab, exprs)
         else:

src/sas/sascalc/fit/pagestate.py

@@ -1 +1 @@
 """
 Class that holds a fit page state
+
+Pagestate fields reflect the names of the gui controls from the sasview 3.x
+fit page, so they are somewhat difficult to interpret.
+
+Pagestate attributes are as follows:
+
+    # =>name: desc       indicates the attribute is derived
+    # name(xml): desc    indicates the attribute name differs from the xml tag
+
+    # SasView version which saved the file
+    version: (4, 1, 2) from <fitting_plug_in version="major.minor.point">
+
+    # Session information
+    group_id: unique id for fit page in running system (int)
+    => data_group_id: unique id for data item in running system (None)
+
+    # Data file
+    data: contents of <SASdata> (Data1D or Data2D)
+    data_name: filename + [num] (latex_smeared.xml [1])
+    data_id: filename + [num] + timestamp (latex_smeared.xml [1]1523303027.73)
+    file: filename + [date time] (latex_smeared.xml [Apr 09 15:45])
+    name: ?? (None)
+    npts: number of points (float)
+    enable2D: True if data is 2D (or if model is 2D and no data)
+    is_data: True (pagestate will not save if there is no data attached)
+
+    # Data weighting
+    dI_didata: True if dy = data.dy
+    dI_idata: True if dy = data.y
+    dI_noweight: True if dy = 1
+    dI_sqrdata: True if dy = sqrt(data.y)
+
+    # Data selection
+    qmax: maximum q (float)
+    qmin: minimum q (float)
+    => qmax_x: ?? (None)
+    => qmin_x: ?? (None)
+
+    # Resolution smearing
+    enable_smearer: True if use data.dx
+    disable_smearer: True if no smearing
+    pinhole_smearer: True if custom pinhole smear
+    slit_smearer: True if custom slit smear
+    dq_l: 2D resolution <dQp>
+    dq_r: 2D resolution <dQs>
+    dx_old: True for 3.x version of custom pinhole, which used dx_min rather
+        than dx_percent, with dx_percent interpreted as 100 * dx_percent/q[0]
+    dx_percent: custom pinhole resolution percentage
+    dxl: slit height for custom slit resolution
+    dxw: slit width for custom slit resolution
+    smearer: repr() for active smearer (None on load)
+    smear_type: None (None on load)
+
+    # Model selection
+    categorycombobox: model category
+    formfactorcombobox: model name (could be "[plug-in] name")
+    structurecombobox: structure factor model name (string or None or "None")
+    multi_factor: multiplicity (integer or None)
+    magnetic_on: True if model is magnetic (only for 2D data for now)
+    => model: active model object (None on load)
+
+    # Model parameters
+    # Parameter is a tuple with the following structure.  The parentheses
+    # indicate xml attribute for the <parameter .../> tag:
+    #    fitted(selected_to_fit): True if parameter is fitted
+    #    name(name): display name for the parameter (string)
+    #    value(value): displayed parameter value (string)
+    #    => plusminus: '+/-' (constant string)
+    #    => uncertainty: tuple
+    #        (uncertainty_displayed): True if there is an uncertainty
+    #        (uncertainty_value): displayed uncertainty (string)
+    #    => lower: tuple
+    #        (minimum_displayed): True if there is a lower bound
+    #        (minimum_value): displayed lower bound (string)
+    #    => upper: tuple
+    #        (maximum_displayed): True if there is a upper bound
+    #        (maximum_value): displayed upper bound (string)
+    #    units(unit): displayed units
+    parameters: list of normal parameters
+    fixed_param: list of non-fitting parameters (nsigma, npts in dispersity)
+    fittable_param: list of fittable dispersity parameters (distribution width)
+    str_parameters: list of selection parameters (e.g, shell forms in spherical_sld)
+    orientation_params(orientation_parameters): list of orientation and
+        magnetic parameters (already included in parameters, so safe to ignore)
+    orientation_params_disp(dispersity_parameters): list of orientation
+        disperisty parameters (already included in fixed_param and
+        fittable_param so safe to ignore)
+
+    # Dispersity controls
+    enable_disp: True if dispersity parameters
+    disable_disp: True if no dispersity parameters
+    disp_obj_dict(disp_obj): {'parameter.width': 'dispersity distribution'}
+    values: {'parameter.width': [array distribution parameter values] }
+    weights: {'parameter.width': [array distribution parameter weights] }
+    => disp_box 0
+    => disp_cb_dict {}
+    => disp_list []
+
+    # Simultaneous fitting
+
+    => images: None (initialized but unused?)
+    => reset: False (initialized but unused?)
+    => event_owner None
+    => m_name None
+    => manager None
+    => page_name
+    => param_toFit: []
+    => process: list of process done on object [] (maybe managed by guiframe?)
+    => saved_states {}
+    => cb1: False (simfit cb1 is now stored in select_all)
+
+    tcChi 1.3463
+    theory_data None
+    timestamp 1523303103.74
+
+Constraint attributes are as follows:
+
+    constraint_dict {}
+    constraints_list
+        {'model_cbox': 'M2', 'param_cbox': 'scale', 'egal_txt': ' = ', 'constraint': 'M1.scale'}
+        {'model_cbox': 'M2', 'param_cbox': 'radius', 'egal_txt': ' = ', 'constraint': 'M1.radius'}
+        {'model_cbox': 'M2', 'param_cbox': 'radius.width', 'egal_txt': ' = ', 'constraint': 'M1.radius.width'}
+    fit_page_no None
+    model_list
+        {'fit_number': '393', 'checked': 'True', 'fit_page_source': 'M2', 'name': 'latex_smeared.xml   [1]1523535051.03', 'model_name': 'sphere'}
+        {'fit_number': '335', 'checked': 'True', 'fit_page_source': 'M1', 'name': 'latex_smeared.xml  1523535050.03', 'model_name': 'sphere'}
+    model_to_fit
+    no_constraint 0
+    select_all True
+
+
 """
 # TODO: Refactor code so we don't need to use getattr/setattr
@@ -162 +293 @@
         self.theory_data = None
         # Is 2D
-        self.is_2D = False
         self.images = None
 
@@ -557 +687 @@
         temp_parameters = []
         temp_fittable_param = []
-        if self.data.__class__.__name__ == "Data2D":
-            self.is_2D = True
-        else:
-            self.is_2D = False
         if self.data is not None:
-            if not self.is_2D:
+            is_2D = (self.data.__class__.__name__ == "Data2D")
+            if not is_2D:
                 for item in self.parameters:
                     if item not in self.orientation_params:

src/sas/sascalc/fit/expression.py

@@ -188 +188 @@
 
     # Initialize dictionary with available functions
-    globals = {}
-    globals.update(math.__dict__)
-    globals.update(dict(arcsin=math.asin,arccos=math.acos,
-                        arctan=math.atan,arctan2=math.atan2))
-    globals.update(context)
-    globals.update(parameters)
-    globals['id'] = id
-    locals = {}
+    global_context = {}
+    global_context.update(math.__dict__)
+    global_context.update(dict(arcsin=math.asin,arccos=math.acos,
+                               arctan=math.atan,arctan2=math.atan2))
+    global_context.update(context)
+    global_context.update(parameters)
+    global_context['id'] = id
+    local_context = {}
 
     # Define the constraints function
@@ -210 +210 @@
 
     #print("Function: "+functiondef)
-    exec(functiondef, globals, locals)
-    retfn = locals['eval_expressions']
+    # CRUFT: python < 3.0;  doc builder isn't allowing the following exec
+    # https://stackoverflow.com/questions/4484872/why-doesnt-exec-work-in-a-function-with-a-subfunction/41368813#comment73790496_41368813
+    #exec(functiondef, global_context, local_context)
+    eval(compile(functiondef, '<string>', 'exec'), global_context, local_context)
+    retfn = local_context['eval_expressions']
 
     # Remove garbage added to globals by exec
-    globals.pop('__doc__',None)
-    globals.pop('__name__',None)
-    globals.pop('__file__',None)
-    globals.pop('__builtins__')
+    global_context.pop('__doc__', None)
+    global_context.pop('__name__', None)
+    global_context.pop('__file__', None)
+    global_context.pop('__builtins__')
     #print globals.keys()
 
@@ -232 +235 @@
 
     # Break pairs into left set and right set
-    left,right = [set(s) for s in zip(*pairs)] if pairs != [] else ([],[])
-    while pairs != []:
+    # Note: pairs is array or list, so use "len(pairs) > 0" to check for empty.
+    left,right = [set(s) for s in zip(*pairs)] if len(pairs) > 0 else ([],[])
+    while len(pairs) > 0:
         #print "within",pairs
         # Find which items only occur on the right
@@ -261 +265 @@
     satisfies the partial ordering given by the pairs in partial order.
     """
-    left,right = zip(*pairs) if pairs != [] else ([],[])
+    # Note: pairs is array or list, so use "len(pairs) > 0" to check for empty.
+    left,right = zip(*pairs) if len(pairs) > 0 else ([],[])
     items = set(left)
     n = order_dependencies(pairs)