Changeset e5b1f17 in sasview


Ignore:
Timestamp:
Feb 18, 2015 9:48:58 AM (8 years ago)
Author:
Peter Parker
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:
66f21cd
Parents:
bd66f66d (diff), 5160609 (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' of github.com:SasView/sasview

Files:
9 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/fit/ScipyFitting.py

    rfd5ac0d ra10364b  
    115115            low,high = model.details[p][1:3] 
    116116            if low is not None and numpy.isfinite(low): 
    117                 if p.value == 0: 
     117                if value == 0: 
    118118                    # This value works on Scipy 
    119119                    # Do not change numbers below 
  • test/park_integration/test/utest_fit_cylinder.py

    r35ec279 ra10364b  
    1010from sas.dataloader.loader import Loader 
    1111 
    12 #@unittest.skip("") 
    1312class TestSingleFit(unittest.TestCase): 
    1413    """ test single fitting """ 
  • test/sasdataloader/test/utest_averaging.py

    ref3445e2 ra10364b  
    196196        import math 
    197197         
     198        nbins = 19 
     199        phi_min = math.pi / (nbins + 1) 
     200        phi_max = math.pi * 2 - phi_min 
     201         
    198202        r = SectorPhi(r_min=.005, 
    199203                      r_max=.01, 
    200                       phi_min=0.15707963, 
    201                       phi_max=math.pi*2.-0.15707963, 
    202                       nbins=19) 
     204                      phi_min=phi_min, 
     205                      phi_max=phi_max, 
     206                      nbins=nbins) 
    203207        o = r(self.data) 
    204208 
Note: See TracChangeset for help on using the changeset viewer.