Changeset 1dc134e6 in sasview for src/sas/sascalc

Timestamp:

Oct 3, 2018 2:42:00 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1094-headless

Children:

1580cc3

Parents:

840ac87 (diff), db24ec1 (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.

Message:

Merge branch 'master' into ticket-1094-headless

Location:

src/sas/sascalc

Files:

• corfunc/LICENSE.TXT (added)
• fit/pagestate.py (modified) (1 diff)
• fit/BumpsFitting.py (modified) (5 diffs)
• fit/fitstate.py (added)

src/sas/sascalc/fit/pagestate.py

@@ -767 +767 @@
                 if len(value.strip()) == 0:
                     continue
-                title = value + " [" + repo_time + "]"
+                title = (value + " [" + repo_time + "] [SasView v" +
+                         SASVIEW_VERSION + "]")
                 title_name = HEADER % title
             elif name == "data":

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: