Changeset 57a91fc in sasview


Ignore:
Timestamp:
Nov 20, 2018 6:20:53 AM (3 weeks ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Invariant, ESS_GUI_batch_fitting, ESS_GUI_ordering
Children:
c30822c
Parents:
be7c981
Message:

cherrypicked changes from master to sascalc (except PR#190)

Location:
src/sas/sascalc/pr
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/pr/fit/BumpsFitting.py

    r9a5097c r57a91fc  
    22BumpsFitting module runs the bumps optimizer. 
    33""" 
     4from __future__ import division 
     5 
    46import os 
    57from datetime import timedelta, datetime 
     
    3436class Progress(object): 
    3537    def __init__(self, history, max_step, pars, dof): 
    36         remaining_time = int(history.time[0]*(float(max_step)/history.step[0]-1)) 
     38        remaining_time = int(history.time[0]*(max_step/history.step[0]-1)) 
    3739        # Depending on the time remaining, either display the expected 
    3840        # time of completion, or the amount of time remaining.  Use precision 
  • src/sas/sascalc/pr/fit/Loader.py

    r574adc7 r57a91fc  
     1""" 
     2class Loader  to load any kind of file 
     3""" 
     4 
    15from __future__ import print_function 
    26 
    3 # class Loader  to load any king of file 
    4 #import wx 
    5 #import string 
    67import numpy as np 
    78 
  • src/sas/sascalc/pr/invertor.py

    raed159f r57a91fc  
    66FIXME: The way the Invertor interacts with its C component should be cleaned up 
    77""" 
     8from __future__ import division 
    89 
    910import numpy as np 
     
    423424            A[i][j] = (Fourier transformed base function for point j) 
    424425 
    425         We them choose a number of r-points, n_r, to evaluate the second 
     426        We then choose a number of r-points, n_r, to evaluate the second 
    426427        derivative of P(r) at. This is used as our regularization term. 
    427428        For a vector r of length n_r, the following n_r rows are set to :: 
     
    480481 
    481482        # Perform the inversion (least square fit) 
    482         c, chi2, _, _ = lstsq(a, b) 
     483        c, chi2, _, _ = lstsq(a, b, rcond=-1) 
    483484        # Sanity check 
    484485        try: 
     
    503504        try: 
    504505            cov = np.linalg.pinv(inv_cov) 
    505             err = math.fabs(chi2 / float(npts - nfunc)) * cov 
    506         except: 
     506            err = math.fabs(chi2 / (npts - nfunc)) * cov 
     507        except Exception as exc: 
    507508            # We were not able to estimate the errors 
    508509            # Return an empty error matrix 
     
    548549        try: 
    549550            return estimator.num_terms(isquit_func) 
    550         except: 
     551        except Exception as exc: 
    551552            # If we fail, estimate alpha and return the default 
    552553            # number of terms 
  • src/sas/sascalc/pr/num_term.py

    rb8080e1 r57a91fc  
    1 from __future__ import print_function 
     1from __future__ import print_function, division 
    22 
    33import math 
     
    5151        osc = self.sort_osc() 
    5252        dv = len(osc) 
    53         med = float(dv) / 2.0 
     53        med = 0.5*dv 
    5454        odd = self.is_odd(dv) 
    5555        medi = 0 
     
    140140            nts = self.compare_err() 
    141141            div = len(nts) 
    142             tem = float(div) / 2.0 
     142            tem = 0.5*div 
    143143            if self.is_odd(div): 
    144144                nt = nts[int(tem)] 
Note: See TracChangeset for help on using the changeset viewer.