Changeset 08959b8 in sasview for src


Ignore:
Timestamp:
Mar 21, 2016 8:29:27 AM (8 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:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/basepage.py

    reb04d59 r08959b8  
    21462146 
    21472147        if  struct_factor != None: 
    2148             from sas.models.MultiplicationModel import MultiplicationModel 
     2148            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel 
    21492149            self.model = MultiplicationModel(form_factor, struct_factor()) 
    21502150            # multifunctional form factor 
  • src/sas/sasgui/perspectives/fitting/models.py

    r9e531f2 r08959b8  
    384384        """ 
    385385        if int(evt.GetId()) in self.form_factor_dict.keys(): 
    386             from sas.models.MultiplicationModel import MultiplicationModel 
     386            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel 
    387387            self.model_dictionary[MultiplicationModel.__name__] = MultiplicationModel 
    388388            model1, model2 = self.form_factor_dict[int(evt.GetId())] 
Note: See TracChangeset for help on using the changeset viewer.