Changeset 0e4e554 in sasview for src/sas/perspectives/fitting/models.py

Timestamp:

Feb 18, 2015 7:48:12 AM (9 years ago)

Author:

ajj

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:

dea7cb4

Parents:

6f82ba1

Message:

start switching to sasmodels including dispersion

File:

• src/sas/perspectives/fitting/models.py (modified) (2 diffs)

src/sas/perspectives/fitting/models.py

@@ -20 +20 @@
 from sas.models.BaseComponent import BaseComponent
 from sas.guiframe.CategoryInstaller import CategoryInstaller
+
+from sasmodels.sasview_model import make_class
    
 PLUGIN_DIR = 'plugin_models'
@@ -310 +312 @@
 
         # regular model names only
-        try:
-            self.model_name_list = []
-            from sas.models.SphereModel import SphereModel
+        self.model_name_list = []
+        try:
+            # from sas.models.SphereModel import SphereModel
+            from sasmodels.models import sphere
+            SphereModel = make_class(sphere, dtype='single')
             self.model_dictionary[SphereModel.__name__] = SphereModel
             #        self.shape_list.append(SphereModel)