Changeset e5b1f17 in sasview

Timestamp:

Feb 18, 2015 7:48:58 AM (9 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:

• src/sas/fit/ScipyFitting.py (modified) (1 diff)
• test/park_integration/test/utest_fit_cylinder.py (modified) (1 diff)
• test/sasdataloader/test/utest_averaging.py (modified) (1 diff)
• build_tools/conda/altgraph/bld.bat (added)
• build_tools/conda/altgraph/build.sh (added)
• build_tools/conda/altgraph/meta.yaml (added)
• build_tools/conda/macholib/bld.bat (added)
• build_tools/conda/macholib/build.sh (added)
• build_tools/conda/macholib/meta.yaml (added)
• build_tools/conda/modulegraph/bld.bat (added)
• build_tools/conda/modulegraph/build.sh (added)
• build_tools/conda/modulegraph/meta.yaml (added)

src/sas/fit/ScipyFitting.py

@@ -115 +115 @@
             low,high = model.details[p][1:3]
             if low is not None and numpy.isfinite(low):
-                if p.value == 0:
+                if value == 0:
                     # This value works on Scipy
                     # Do not change numbers below

test/park_integration/test/utest_fit_cylinder.py

@@ -10 +10 @@
 from sas.dataloader.loader import Loader
 
-#@unittest.skip("")
 class TestSingleFit(unittest.TestCase):
     """ test single fitting """

test/sasdataloader/test/utest_averaging.py

@@ -196 +196 @@
         import math
         
+        nbins = 19
+        phi_min = math.pi / (nbins + 1)
+        phi_max = math.pi * 2 - phi_min
+        
         r = SectorPhi(r_min=.005,
                       r_max=.01,
-                      phi_min=0.15707963,
-                      phi_max=math.pi*2.-0.15707963,
-                      nbins=19)
+                      phi_min=phi_min,
+                      phi_max=phi_max,
+                      nbins=nbins)
         o = r(self.data)