Changeset ca4c150 in sasview for sansmodels/src/sans/models


Ignore:
Timestamp:
Jan 18, 2011 4:43:28 PM (14 years ago)
Author:
Jae Cho <jhjcho@…>
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:
f1e06a8e
Parents:
f1abc57
Message:

update nsigmas value due to the default changes from 2.5 to 3.0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/test/utest_other_dispersity.py

    rdfa8832 rca4c150  
    1717        self.model.setParam('radius', 20.0) 
    1818        self.model.setParam('length', 400.0) 
    19         self.model.setParam('contrast', 3.e-6) 
     19        self.model.setParam('sldCyl', 4.e-6) 
     20        self.model.setParam('sldSolv', 1.e-6) 
    2021        self.model.setParam('background', 0.0) 
    2122        self.model.setParam('cyl_theta', 0.0) 
     
    3334        self.model.dispersion['radius']['width'] = 5.0 
    3435        self.model.dispersion['radius']['npts'] = 100 
     36        self.model.dispersion['radius']['nsigmas'] = 2.5 
    3537        print "constant",self.model.run(0.001), self.model.dispersion 
    3638        self.assertAlmostEqual(self.model.run(0.001), 1.021051*4527.47250339, 3) 
     
    4345        self.model.dispersion['radius']['width'] = 5.0 
    4446        self.model.dispersion['radius']['npts'] = 100 
     47        self.model.dispersion['radius']['nsigmas'] = 2.5 
    4548        self.model.setParam('scale', 10.0) 
    4649         
     
    5457        self.model.dispersion['radius']['width'] = 5.0 
    5558        self.model.dispersion['radius']['npts'] = 100 
     59        self.model.dispersion['radius']['nsigmas'] = 2.5 
    5660        self.model.setParam('scale', 10.0) 
    5761         
     
    6872        #self.model.dispersion['radius']['width'] = 0.0 
    6973        self.model.dispersion['radius']['npts'] = 100 
     74        self.model.dispersion['radius']['nsigmas'] = 2.5 
    7075        #self.model.setParam('scale', 1.0) 
    7176        self.model.setParam('scale', 10.0) 
     
    8186        #self.model.dispersion['radius']['width'] = 0.0 
    8287        self.model.dispersion['radius']['npts'] = 100 
     88        self.model.dispersion['radius']['nsigmas'] = 2.5 
    8389        #self.model.setParam('scale', 1.0) 
    8490        self.model.setParam('scale', 10.0) 
     
    94100        self.model.dispersion['radius']['width'] = 0.0 
    95101        self.model.dispersion['radius']['npts'] = 100 
     102        self.model.dispersion['radius']['nsigmas'] = 2.5 
    96103        self.model.setParam('scale', 1.0) 
    97104         
     
    112119        weights   = numpy.zeros(100) 
    113120        for i in range(100): 
    114             values_ph[i]=(2.0*math.pi/99.0*i) 
    115             values_th[i]=(math.pi/99.0*i) 
     121            values_ph[i]=(360/99.0*i) 
     122            values_th[i]=(180/99.0*i) 
    116123            weights[i]=(1.0) 
    117124         
Note: See TracChangeset for help on using the changeset viewer.