Changeset 8c9e65c in sasview for src/sas/sascalc/pr/fit

Timestamp:

Mar 5, 2019 11:52:24 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

f205d3a, 1342f6a

Parents:

0a924c6 (diff), 4cbb2f5 (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/05/19 11:52:24)

git-committer:

GitHub <noreply@…> (03/05/19 11:52:24)

Message:

py37 support for sascalc. Refs #888 an #1233.

Location:

src/sas/sascalc/pr/fit

Files:

• expression.py (modified) (1 diff)
• BumpsFitting.py (modified) (2 diffs)
• Loader.py (modified) (1 diff)

src/sas/sascalc/pr/fit/expression.py

@@ -210 +210 @@
 
     #print("Function: "+functiondef)
-    exec functiondef in globals,locals
+    exec(functiondef, globals, locals)
     retfn = locals['eval_expressions']
 

src/sas/sascalc/pr/fit/BumpsFitting.py

@@ -2 +2 @@
 BumpsFitting module runs the bumps optimizer.
 """
+from __future__ import division
+
 import os
 from datetime import timedelta, datetime
@@ -34 +36 @@
 class Progress(object):
     def __init__(self, history, max_step, pars, dof):
-        remaining_time = int(history.time[0]*(float(max_step)/history.step[0]-1))
+        remaining_time = int(history.time[0]*(max_step/history.step[0]-1))
         # Depending on the time remaining, either display the expected
         # time of completion, or the amount of time remaining.  Use precision

src/sas/sascalc/pr/fit/Loader.py

@@ +1 @@
+"""
+class Loader  to load any kind of file
+"""
+
 from __future__ import print_function
 
-# class Loader  to load any king of file
-#import wx
-#import string
 import numpy as np