Changeset fc18690 in sasview


Ignore:
Timestamp:
Mar 18, 2016 5:59:10 AM (7 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
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:
c81f9b6
Parents:
c10d9d6c
Message:

Sasmodels integration - moved smearing from models to sascalc.

Files:
7 edited
6 moved

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/data_util/qsmearing.py

    • Property mode changed from 100644 to 100755
    ra3f125f0 rfc18690  
    1414import sys 
    1515import sas.models.sas_extension.smearer as smearer 
    16 from sas.models.smearing_2d import Smearer2D 
     16from sas.sascalc.data_util.smearing_2d import Smearer2D 
    1717 
    1818def smear_selection(data1D, model = None): 
  • src/sas/sascalc/data_util/resolution.py

    • Property mode changed from 100644 to 100755
  • src/sas/sascalc/data_util/smearing_2d.py

    • Property mode changed from 100644 to 100755
  • src/sas/sascalc/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,..,], 
  • 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,..,], 
  • src/sas/sasgui/perspectives/fitting/batchfitpage.py

    rd85c194 rfc18690  
    1515 
    1616from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent 
    17 from sas.models.qsmearing import smear_selection 
     17from sas.sascalc.data_util.qsmearing import smear_selection 
    1818from sas.sasgui.perspectives.fitting.fitpage import FitPage 
    1919from sas.sasgui.perspectives.fitting.fitpage import check_data_validity 
  • src/sas/sasgui/perspectives/fitting/fitpage.py

    rd85c194 rfc18690  
    2626from sas.sasgui.perspectives.fitting.basepage import BasicPage as BasicPage 
    2727from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent as PageInfoEvent 
    28 from sas.models.qsmearing import smear_selection 
     28from sas.sascalc.data_util.qsmearing import smear_selection 
    2929from .basepage import ModelTextCtrl 
    3030 
  • src/sas/sasgui/perspectives/fitting/fitproblem.py

    rd85c194 rfc18690  
    1414################################################################################ 
    1515import copy 
    16 from sas.models.qsmearing import smear_selection 
     16from sas.sascalc.data_util.qsmearing import smear_selection 
    1717 
    1818class FitProblemComponent(object): 
  • test/sasdataloader/test/utest_smearing.py

    rb699768 rfc18690  
    99from sas.sascalc.dataloader.data_info import Data1D, Data2D 
    1010#from DataLoader.qsmearing import SlitSmearer, QSmearer, smear_selection 
    11 from sas.models.qsmearing import SlitSmearer, QSmearer, smear_selection 
     11from sas.sascalc.data_util.qsmearing import SlitSmearer, QSmearer, smear_selection 
    1212from sas.models.SphereModel import SphereModel 
    1313import os.path 
  • test/sasfit/test/batch_fit.py

    rb699768 rfc18690  
    66from sas.models.CylinderModel import CylinderModel 
    77import sas.models.dispersion_models  
    8 from sas.models.qsmearing import smear_selection 
     8from sas.sascalc.data_util.qsmearing import smear_selection 
    99 
    1010NPTS = 1 
  • test/sasfit/test/utest_fit_smeared.py

    rb699768 rfc18690  
    1010from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit 
    1111from sas.sascalc.dataloader.loader import Loader 
    12 from sas.models.qsmearing import smear_selection 
     12from sas.sascalc.data_util.qsmearing import smear_selection 
    1313from sas.models.CylinderModel import CylinderModel 
    1414from sas.models.SphereModel import SphereModel 
Note: See TracChangeset for help on using the changeset viewer.