Changeset 08959b8 in sasview

Timestamp:

Mar 21, 2016 10:29:27 AM (9 years ago)

Author:

krzywon

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:

3694eab3

Parents:

8d75c5a

Message:

Commiting the MultiplicationModel? back to source and moving it from sas.models to sas.sascalc.fitting

Location:

src/sas

Files:

• sascalc/fit/MultiplicationModel.py (added)
• sasgui/perspectives/fitting/basepage.py (modified) (1 diff)
• sasgui/perspectives/fitting/models.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2146 +2146 @@
 
         if  struct_factor != None:
-            from sas.models.MultiplicationModel import MultiplicationModel
+            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
             self.model = MultiplicationModel(form_factor, struct_factor())
             # multifunctional form factor

src/sas/sasgui/perspectives/fitting/models.py

@@ -384 +384 @@
         """
         if int(evt.GetId()) in self.form_factor_dict.keys():
-            from sas.models.MultiplicationModel import MultiplicationModel
+            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
             self.model_dictionary[MultiplicationModel.__name__] = MultiplicationModel
             model1, model2 = self.form_factor_dict[int(evt.GetId())]