Changeset b2669f5 in sasview for src/sas/sascalc/pr


Ignore:
Timestamp:
Mar 18, 2016 6:24:33 AM (9 years ago)
Author:
smk78
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:
fdeabcc
Parents:
6177333 (diff), c81f9b6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sascalc/pr/fit/AbstractFitEngine.py

    rb699768 rfc18690  
    140140            do the following: :: 
    141141             
    142                 from sas.models.qsmearing import smear_selection 
     142                from sas.sascalc.data_util.qsmearing import smear_selection 
    143143                smearer = smear_selection(some_data) 
    144144                fitdata1d = FitData1D( x= [1,3,..,], 
Note: See TracChangeset for help on using the changeset viewer.