Changeset aff7904 in sasview for sasview

Timestamp:

Apr 28, 2016 7:38:05 AM (8 years ago)

Author:

wojciech

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:

3371d81

Parents:

5881b17 (diff), 259aaa0 (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:

Conflicts fixed, merged with master

Location:

sasview

Files:

• README.txt (modified) (2 diffs)
• __init__.py (modified) (1 diff)
• default_categories.json (modified) (1 diff)
• setup_exe.py (modified) (2 diffs)
• setup_mac.py (modified) (1 diff)

sasview/README.txt

@@ -4 +4 @@
 1- Features
 ===========
+
+    - New in Version 4.0.0-alpha
+      --------------------
+      This alpha release brings a major overhaul of the model system. The new model
+      package allows rapid integration of custom models and access to polydispersity
+      without requiring a compiler.
+
+      - Model package changes and improvements
+         - Model interface moved to independent sasmodels package.
+         - Most models converted to new interface.
+         - Allows rapid integration of user-written models.
+         - OpenCL GPU utilization for faster fitting.
+         - Improved numerical integration of Bessel functions.
+      - SESANS integration and implementation
+         - Scripting interface added for analysis of SESANS data.
+         - Hankel transformation now accepts finite acceptance angles.
+         - 2D cosine transformation added for TOF SESANS analysis.
+      - Documentation improvements
+         - The documentation tree was restructured for a better end user experience.
+         - The documentation for each model was revamped and verified by at least
+           two people following the conversion of the model.
+         - Theoretical 1D (and 2D if applicable) scattering curves are auto-generated
+           and added to the model documentation for each model.
+      - Separation of GUI and calculations for future GUI enhancements
+      - Bug fixes
+         - Fixes bug #411 No stop button on simultaneous fit page
+         - Fixes bug #410 Error with raspberry model
+         - Fixes bug #364 Possible inconsistency in Poly_GausCoil model
+         - Fixes bug #439 Hayter Penfold MSA code needs checking
+         - Fixes bug #484 lammellerPC is precision limited
+         - Fixes bug #498 $HOME/.matplotlib conflicts
+         - Fixes bug #348 Control order in which fit parameters appear in the gui
+         - Fixes bug #456 Provide DREAM Results Panel with something to identify
+           data and age of results
+         - Fixes bug #556 Build script improvements for developers
+
+
 
    - New in Version 3.1.2
@@ -306 +343 @@
             - unittest-xml-reporting 1.12.0 (MAC 1.10.0)
             - matplotlib Version Installed: 1.4.3 (MAC 1.1.1)
-            - bumps Version Installed: 0.7.5.6
+            - bumps Version Installed: 0.7.5.9
             - scipy Version Installed: 0.16.0b2 (MAC 0.11.0)
             - periodictable Version Installed: 1.4.1

sasview/__init__.py

@@ -1 @@
-__version__ = "3.1.2"
+__version__ = "4.0.0-alpha"
 __build__ = "1"

sasview/default_categories.json

@@ -1 @@
-{"Shapes": [["barbell", true], ["pearl_necklace", true], ["hollow_cylinder", true], ["CoreMultiShellModel", true], ["fcc_paracrystal", true], ["parallelepiped", true], ["fuzzy_sphere", true], ["core_shell_ellipsoid_xt", true], ["lamellarPC", true], ["bcc_paracrystal", true], ["ellptical_cylinder", true], ["hollow_rectangular_prism_infinitely_thin_walls", true], ["core_shell_parallelepiped", true], ["OnionExpShellModel", true], ["multi_shell", true], ["raspberry", true], ["core_shell_ellipsoid", true], ["capped_cylinder", true], ["cylinder", true], ["SphericalSLDModel", true], ["sc_crystal", true], ["stacked_disks", true], ["LamellarPSHGModel", true], ["core_shell_bicelle", true], ["hollow_rectangular_prism", true], ["LamellarPSModel", true], ["ellipsoid", true], ["sphere", true], ["vesicle", true], ["triaxial_ellipsoid", true], ["lamellar", true], ["pringles", true], ["rectangular_prism", true], ["core_shell_cylinder", true], ["BinaryHSModel", true], ["flexible_cylinder", true], ["lamellarFFHG", true], ["flexible_cylinder_ex", true], ["linear_pearls", true], ["core_shell_sphere", true]], "Structure Factor": [["squarewell", true], ["hayter_msa", true], ["hardsphere", true], ["stickyhardsphere", true]], "Shape-Independent": [["two_power_law", true], ["gel_fit", true], ["dab", true], ["power_law", true], ["porod", true], ["guinier", true], ["rpa", true], ["teubner_strey", true], ["star_polymer", true], ["UnifiedPowerRgModel", true], ["mass_surface_fractal", true], ["adsorbed_layer", true], ["two_lorentzian", true], ["mono_gauss_coil", true], ["mass_fractal", true], ["guinier_porod", true], ["correlation_length", true], ["polymer_excl_volume", true], ["FractalModel", true], ["peak_lorentz", true], ["broad_peak", true], ["fractal_core_shell", true], ["gaussian_peak", true], ["be_polyelectrolyte", true], ["poly_gauss_coil", true], ["surface_fractal", true], ["gauss_lorentz_gel", true], ["lorentz", true]], "Uncategorized": [["ReflectivityModel", true], ["ReflectivityIIModel", true], ["line", true], ["micell_spherical_coil", true]]}
+{"Shapes": [["cylinder", true], ["lamellar_stack_paracrystal", true], ["multilayer_vesicle", true], ["core_shell_cylinder", true], ["lamellar_hg", true], ["fuzzy_sphere", true], ["sphere", true], ["triaxial_ellipsoid", true], ["rectangular_prism", true], ["core_shell_bicelle", true], ["flexible_cylinder", true], ["flexible_cylinder_elliptical", true], ["binary_hard_sphere", true], ["core_multi_shell", true], ["sc_paracrystal", true], ["ellipsoid", true], ["capped_cylinder", true], ["core_shell_ellipsoid", true], ["fcc_paracrystal", true], ["core_shell_parallelepiped", true], ["core_shell_ellipsoid_xt", true], ["elliptical_cylinder", true], ["pringle", true], ["hollow_rectangular_prism_thin_walls", true], ["hollow_rectangular_prism", true], ["vesicle", true], ["polymer_micelle", true], ["parallelepiped", true], ["hollow_cylinder", true], ["linear_pearls", true], ["spherical_sld", true], ["raspberry", true], ["lamellar_hg_stack_caille", true], ["pearl_necklace", true], ["lamellar", true], ["onion", true], ["lamellar_stack_caille", true], ["bcc_paracrystal", true], ["core_shell_sphere", true], ["stacked_disks", true]], "Structure Factor": [["hayter_msa", true], ["squarewell", true], ["stickyhardsphere", true], ["hardsphere", true]], "Shape-Independent": [["guinier_porod", true], ["polymer_excl_volume", true], ["gel_fit", true], ["teubner_strey", true], ["mono_gauss_coil", true], ["mass_surface_fractal", true], ["mass_fractal", true], ["adsorbed_layer", true], ["two_lorentzian", true], ["fractal", true], ["fractal_core_shell", true], ["dab", true], ["poly_gauss_coil", true], ["star_polymer", true], ["broad_peak", true], ["surface_fractal", true], ["two_power_law", true], ["power_law", true], ["rpa", true], ["be_polyelectrolyte", true], ["peak_lorentz", true], ["guinier", true], ["correlation_length", true], ["line", true], ["gaussian_peak", true], ["porod", true], ["gauss_lorentz_gel", true], ["lorentz", true]]}

sasview/setup_exe.py

@@ -256 +256 @@
 data_files += guiframe.data_files()
 
-import sas.models as models
+#import sas.models as models
+import sasmodels.models as models
 data_files += models.data_files()
 
@@ -338 +339 @@
 packages = [
     'matplotlib', 'scipy', 'encodings', 'comtypes',
-    'win32com', 'xhtml2pdf', 'bumps',
+    'win32com', 'xhtml2pdf', 'bumps','sasmodels', 'sas',
     ]
 packages.extend([

sasview/setup_mac.py

@@ -43 +43 @@
 import sas.sasgui.perspectives.invariant as invariant
 DATA_FILES += invariant.data_files()
-#import sas.models as models
 import sasmodels.models as models
 DATA_FILES += models.data_files()