Changeset 5fcfca4 in sasview for park_integration


Ignore:
Timestamp:
Nov 18, 2008 9:59:37 AM (16 years ago)
Author:
Gervaise Alina <gervyh@…>
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:
61cb28d
Parents:
55e13ab
Message:

smearing added

Location:
park_integration
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • park_integration/AbstractFitEngine.py

    r415bc97 r5fcfca4  
    191191        """ 
    192192        ## Smearing object 
    193         self.smearer = None 
     193        self.smearer = sans_data1d.smearer 
    194194 
    195195        # Initialize from Data1D object 
  • park_integration/Fitting.py

    r0e51519 r5fcfca4  
    44    a park fit or a scipy fit. 
    55""" 
    6 from sans.guitools.plottables import Data1D 
     6#from sans.guitools.plottables import Data1D 
     7from danse.common.plottools.plottables import Data1D 
    78from Loader import Load 
    89from scipy import optimize 
  • park_integration/ScipyFitting.py

    rf8ce013 r5fcfca4  
    66#import scipy.linalg 
    77import numpy  
    8 from sans.guitools.plottables import Data1D 
     8#from sans.guitools.plottables import Data1D 
     9from danse.common.plottools.plottables import Data1D 
    910from Loader import Load 
    1011from scipy import optimize 
  • park_integration/test/test_fit_cylinder.py

    r385d464 r5fcfca4  
    33""" 
    44import unittest 
    5 from sans.guitools.plottables import Theory1D 
    6 from sans.guitools.plottables import Data1D 
     5#from sans.guitools.plottables import Theory1D 
     6#from sans.guitools.plottables import Data1D 
     7from danse.common.plottools.plottables import Data1D,Theory1D 
    78from sans.fit.AbstractFitEngine import Data, Model,FitData1D 
    89import math 
  • park_integration/test/test_fit_line.py

    r7d0c1a8 r5fcfca4  
    33""" 
    44import unittest 
    5 from sans.guitools.plottables import Theory1D 
    6 from sans.guitools.plottables import Data1D 
     5#from sans.guitools.plottables import Theory1D 
     6#from sans.guitools.plottables import Data1D 
     7from danse.common.plottools.plottables import Data1D,Theory1D 
    78from sans.fit.AbstractFitEngine import Data, Model,FitData1D 
    89import math 
  • park_integration/test/test_fit_smeared.py

    r5893cdb r5fcfca4  
    123123        fitter.set_data(self.data_res,1) 
    124124        fitter._engine.fitArrangeDict[1].dList[0].smearer = smear 
    125          
     125        print "smear ",smear 
    126126        # Model: maybe there's a better way to do this. 
    127127        # Ideally we should have to create a new model from our sans model. 
Note: See TracChangeset for help on using the changeset viewer.