Changeset 0e4e554 in sasview for src/sas/perspectives/fitting/fitpage.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/fitpage.py (modified) (1 diff)

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