Changeset 9c117a2 in sasmodels


Ignore:
Timestamp:
Feb 19, 2015 8:52:32 AM (9 years ago)
Author:
jhbakker
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
8632a35
Parents:
a006b63
Message:

sesansfit and bump_model update to make bumps fitting work

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • example/sesansfit.py

    r0ac3db5 r9c117a2  
    44from sasmodels import bumps_model as sas 
    55kernel = sas.load_model('sphere', dtype='single') 
     6#kernel = sas.load_model('triaxial_ellipsoid', dtype='single') 
    67 
    78 
     
    1112    loader=Loader() 
    1213    data=loader.load('testsasview1.ses') 
     14    data.x /=10 
    1315     
    1416#    data = load_sesans('mydatfile.pz') 
     
    2022    err_data = np.ones_like(SElength)*0.03 
    2123 
     24    class Sample: 
     25        zacceptance = 0.1 # [A^-1] 
     26        thickness = 0.2 # [cm] 
     27         
    2228    class SESANSData1D: 
    2329        #q_zmax = 0.23 # [A^-1] 
    24         zacceptance = 0.1 # [A^-1] 
    25         lam = 2e-10 # [m] 
    26         thickness = 0.2 # [cm] 
     30        lam = 0.2 # [nm] 
    2731        x = SElength 
    2832        y = data 
    2933        dy = err_data 
    30     data = SesansData() 
    31 print dir(data) 
     34        sample = Sample() 
     35    data = SESANSData1D() 
    3236 
    3337radius = 1000 
    3438data.Rmax = 3*radius # [A] 
    3539 
     40##  Sphere parameters 
     41 
    3642phi = Parameter(0.1, name="phi") 
    3743model = sas.BumpsModel(data, kernel, 
    3844    scale=phi*(1-phi), sld=7.0, solvent_sld=1.0, radius=radius) 
    39 phi.pmp(10) 
    40 model.radius.pmp(40) 
    41 model.sld.pm(2) 
    42 model.background.range(0,5) 
    43  
     45phi.range(0.001,0.90) 
     46#model.radius.pmp(40) 
     47model.radius.range(100,10000) 
     48#model.sld.pmp(5) 
     49#model.background 
     50#model.radius_pd=0 
     51#model.radius_pd_n=0 
    4452 
    4553if False: # have sans data 
     
    4957    problem = FitProblem(model) 
    5058 
     59 
     60### Tri-Axial Ellipsoid 
     61# 
     62#phi = Parameter(0.1, name='phi') 
     63#model = sas.BumpsModel(data, kernel, 
     64#    scale=phi*(1-phi), sld=7.0, solvent_sld=1.0, radius=radius) 
     65#phi.range(0.001,0.90) 
     66##model.radius.pmp(40) 
     67#model.radius.range(100,10000) 
     68##model.sld.pmp(5) 
     69##model.background 
     70##model.radius_pd=0 
     71##model.radius_pd_n=0 
     72# 
     73#if False: # have sans data 
     74#    sansmodel = sas.BumpsModel(sans_data, kernel, **model.parameters()) 
     75#    problem = FitProblem([model, sansmodel]) 
     76#else: 
     77#    problem = FitProblem(model) 
  • sasmodels/bumps_model.py

    r0ac3db5 r9c117a2  
    354354            #self._theory[:] = self._fn.eval(pars, pd_pars) 
    355355            if self.data_type == 'sesans': 
    356                 P = sesans.hankel(self.data.x, self.data.lam, 
     356                P = sesans.hankel(self.data.x, self.data.lam*1e-9, 
    357357                                  self.data.sample.thickness/10, self._fn_inputs[0], 
    358358                                  self._theory) 
Note: See TracChangeset for help on using the changeset viewer.