Changeset 0e4e554 in sasview

Timestamp:

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

Files:

• run.py (modified) (1 diff)
• setup.py (modified) (4 diffs)
• src/sas/models/dispersion_models.py (modified) (1 diff)
• src/sas/perspectives/fitting/basepage.py (modified) (3 diffs)
• src/sas/perspectives/fitting/fitpage.py (modified) (1 diff)
• src/sas/perspectives/fitting/models.py (modified) (2 diffs)

run.py

@@ -105 +105 @@
     addpath(joinpath(root, 'park-1.2.1'))
 
+    # sasmodels on the path
+    addpath(joinpath(root, '../sasmodels/'))
+
     # Import the sasview package from root/sasview as sas.sasview.  It would
     # be better to just store the package in src/sas/sasview.

setup.py

@@ -260 +260 @@
 model_dir = os.path.join("src", "sas","models")
 
-if os.path.isdir(wrapper_dir):
-    for file in os.listdir(wrapper_dir): 
-        file_path =  os.path.join(wrapper_dir, file)
-        os.remove(file_path)
-else:
-    os.makedirs(wrapper_dir)
-sys.path.append(os.path.join("src", "sas", "models", "c_extension", "python_wrapper"))
-from wrapping import generate_wrappers
-generate_wrappers(header_dir = includedir, 
-                  output_dir = model_dir,
-                  c_wrapper_dir = wrapper_dir)
+#if os.path.isdir(wrapper_dir):
+#    for file in os.listdir(wrapper_dir):
+#        file_path =  os.path.join(wrapper_dir, file)
+#        os.remove(file_path)
+#else:
+#    os.makedirs(wrapper_dir)
+#sys.path.append(os.path.join("src", "sas", "models", "c_extension", "python_wrapper"))
+#from wrapping import generate_wrappers
+#generate_wrappers(header_dir = includedir,
+#                  output_dir = model_dir,
+#                  c_wrapper_dir = wrapper_dir)
 
 IGNORED_FILES = [".svn"]
@@ -299 +299 @@
 model_sources = []
 append_file(file_list=model_sources, dir_path=igordir)
-append_file(file_list=model_sources, dir_path=c_model_dir)
-append_file(file_list=model_sources, dir_path=wrapper_dir)
+#append_file(file_list=model_sources, dir_path=c_model_dir)
+#append_file(file_list=model_sources, dir_path=wrapper_dir)
 
 smear_sources = []
@@ -319 +319 @@
 
 c_models = [ 
-    Extension("sas.models.sas_extension.c_models",
-        sources=model_sources,                 
-        include_dirs=[
-            igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
-        ],
-    ),
+    #Extension("sas.models.sas_extension.c_models",
+    #    sources=model_sources,
+    #    include_dirs=[
+    #        igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
+    #    ],
+    #),
 
     # Smearer extension
@@ -356 +356 @@
 ext_modules.extend(c_models)
 
+packages.append("sas.models")
 # SasView
 

src/sas/models/dispersion_models.py

@@ -154 +154 @@
         c_models.set_dispersion_weights(self.cdisp, values, weights)
         
-models = {"gaussian":GaussianDispersion,  "rectangula":RectangleDispersion,
+models = {"gaussian":GaussianDispersion,  "rectangular":RectangleDispersion,
           "array":ArrayDispersion, "schulz":SchulzDispersion, 
           "lognormal":LogNormalDispersion}       

src/sas/perspectives/fitting/basepage.py

@@ -1196 +1196 @@
                                                     state.disp_cb_dict[item])
                         # Create the dispersion objects
-                        from sas.models.dispersion_models import ArrayDispersion
+                        #from sas.models.dispersion_models import ArrayDispersion
+                        from sasmodels.weights import ArrayDispersion
                         disp_model = ArrayDispersion()
                         if hasattr(state, "values") and \
@@ -1463 +1464 @@
             if disp.__class__.__name__ == 'str':
                 disp_model = None
-                com_str = "from sas.models.dispersion_models "
+                #com_str = "from sas.models.dispersion_models "
+                com_str = "from sasmodels.weights "
                 com_str += "import %s as disp_func \ndisp_model = disp_func()"
                 exec com_str % disp
@@ -2655 +2657 @@
         self.weights = {}
       
-        from sas.models.dispersion_models import GaussianDispersion
+        #from sas.models.dispersion_models import GaussianDispersion
+        from sasmodels.weights import GaussianDispersion
         if len(self.disp_cb_dict) == 0:
             self.save_current_state()

src/sas/perspectives/fitting/fitpage.py

@@ -608 +608 @@
         model_disp = wx.StaticText(self, -1, 'Function')
         CHECK_STATE = self.cb1.GetValue()
-        import sas.models.dispersion_models
-        self.polydisp = sas.models.dispersion_models.models
+        #import sas.models.dispersion_models
+        #self.polydisp = sas.models.dispersion_models.models
+        import sasmodels.weights
+        self.polydisp = sasmodels.weights.models
 
         ix = 0

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)