Changeset 0824909 in sasview for sansmodels/src


Ignore:
Timestamp:
Apr 15, 2009 7:59:36 AM (15 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:
27c5c26
Parents:
b22748b
Message:

changed notation of units

Location:
sansmodels/src/sans/models
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/BEPolyelectrolyte.py

    r988130c6 r0824909  
    3838        self.name = "BEPolyelectrolyte" 
    3939        self.description=""" 
    40         F(x) = K*1/(4*pi*Lb*(alpha)^(2))*(q^(2)+k2)/(1+(r02)^(2))*(q^(2)+k2)\ 
    41                        *(q^(2)-(12*h*C/b^(2))) 
     40        F(x) = K*1/(4*pi*Lb*(alpha)^(2))*(q^(2)+k^(2))/(1+(r02)^(2)) 
     41            *(q^(2)+k^(2))*(q^(2)-(12*h*C/b^(2)))+bkd 
    4242        The model has Eight parameters:  
    4343        K        =  Constrast factor of the polymer 
     
    6464        ## Parameter details [units, min, max] 
    6565        self.details = {} 
    66         self.details['k']    = ['barns', None, None] 
    67         self.details['lb'] = ['A', None, None] 
    68         self.details['h']   = ['A-3', None, None] 
    69         self.details['b']    = ['A', None, None] 
    70         self.details['cs'] = ['mol/L', None, None] 
     66        self.details['k']    = ['[barns]', None, None] 
     67        self.details['lb'] = ['[Å]', None, None] 
     68        self.details['h']   = ['[1/ų]', None, None] 
     69        self.details['b']    = ['[Å]', None, None] 
     70        self.details['cs'] = ['[mol/L]', None, None] 
    7171        self.details['alpha']   = ['', None, None] 
    72         self.details['c']    = ['mol/L', None, None] 
    73         self.details['background'] = ['cm-1', None, None] 
     72        self.details['c']    = ['[mol/L]', None, None] 
     73        self.details['background'] = ['[1/cm]', None, None] 
    7474        #list of parameter that cannot be fitted 
    7575        self.fixed= [] 
     
    7878        """ 
    7979            Evaluate   
    80             F(x) = K*1/(4*pi*Lb*(alpha)^(2))*(q^(2)+k2)/(1+(r02)^(2))*(q^(2)+k2)\ 
    81                        *(q^(2)-(12*h*C/b^(2))) 
     80            F(x) = K*1/(4*pi*Lb*(alpha)^(2))*(q^(2)+k2)/(1+(r02)^(2)) 
     81                *(q^(2)+k2)*(q^(2)-(12*h*C/b^(2))) 
    8282         
    8383            has 3 internal parameters : 
  • sansmodels/src/sans/models/CoreShellCylinderModel.py

    r25a608f5 r0824909  
    3333        List of default parameters: 
    3434         scale           = 1.0  
    35          radius          = 20.0 A 
    36          thickness       = 10.0 A 
    37          length          = 400.0 A 
    38          core_sld        = 1e-006 A-2 
    39          shell_sld       = 4e-006 A-2 
    40          solvent_sld     = 1e-006 A-2 
    41          background      = 0.0 cm-1 
    42          axis_theta      = 1.57 rad 
    43          axis_phi        = 0.0 rad 
     35         radius          = 20.0 [Å] 
     36         thickness       = 10.0 [Å] 
     37         length          = 400.0 [Å] 
     38         core_sld        = 1e-006 [1/Ų] 
     39         shell_sld       = 4e-006 [1/Ų] 
     40         solvent_sld     = 1e-006 [1/Ų] 
     41         background      = 0.0 [1/cm] 
     42         axis_theta      = 1.57 [rad] 
     43         axis_phi        = 0.0 [rad] 
    4444 
    4545    """ 
     
    5757        self.description ="""P(q,alpha)= scale/Vs*f(q)^(2) + bkg  Where:\n\ 
    5858                f(q)= 2(core_sld- solvant_sld)* Vc*sin[qLcos(alpha/2)]/\n\ 
    59                 [qLcos(alpha/2)]*J1(qRsin(alpha))/[qRsin(alpha)] +\n 2(shell_sld-solvent_sld)*Vs 
     59                [qLcos(alpha/2)]*J1(qRsin(alpha))/[qRsin(alpha)] +\n 
     60                2(shell_sld-solvent_sld)*Vs 
    6061                *sin[q(L+T)cos(alpha/2)]/[[q(L+T)cos(alpha/2)] 
    6162                *J1(q(R+T)sin(alpha))/q(R+T)sin(alpha)] 
    62                 alpha:is the angle between the axis of the cylinder and the q-vector 
     63                alpha:is the angle between the axis of the cylinder 
     64                and the q-vector 
    6365                Vs: the volume of the outer shell 
    6466                Vc: the volume of the core 
     
    7779        self.details = {} 
    7880        self.details['scale'] = ['', None, None] 
    79         self.details['radius'] = ['A', None, None] 
    80         self.details['thickness'] = ['A', None, None] 
    81         self.details['length'] = ['A', None, None] 
    82         self.details['core_sld'] = ['A-2', None, None] 
    83         self.details['shell_sld'] = ['A-2', None, None] 
    84         self.details['solvent_sld'] = ['A-2', None, None] 
    85         self.details['background'] = ['cm-1', None, None] 
    86         self.details['axis_theta'] = ['rad', None, None] 
    87         self.details['axis_phi'] = ['rad', None, None] 
     81        self.details['radius'] = ['[Å]', None, None] 
     82        self.details['thickness'] = ['[Å]', None, None] 
     83        self.details['length'] = ['[Å]', None, None] 
     84        self.details['core_sld'] = ['[1/Ų]', None, None] 
     85        self.details['shell_sld'] = ['[1/Ų]', None, None] 
     86        self.details['solvent_sld'] = ['[1/Ų]', None, None] 
     87        self.details['background'] = ['[1/cm]', None, None] 
     88        self.details['axis_theta'] = ['[rad]', None, None] 
     89        self.details['axis_phi'] = ['[rad]', None, None] 
    8890 
    8991                ## fittable parameters 
  • sansmodels/src/sans/models/CoreShellModel.py

    r25a608f5 r0824909  
    3333        List of default parameters: 
    3434         scale           = 1.0  
    35          radius          = 60.0 A 
    36          thickness       = 10.0 A 
    37          core_sld        = 1e-006 A-2 
    38          shell_sld       = 2e-006 A-2 
    39          solvent_sld     = 3e-006 A-2 
    40          background      = 0.0 cm-1 
     35         radius          = 60.0 [Å] 
     36         thickness       = 10.0 [Å] 
     37         core_sld        = 1e-006 [1/Ų] 
     38         shell_sld       = 2e-006 [1/Ų] 
     39         solvent_sld     = 3e-006 [1/Ų] 
     40         background      = 0.0 [1/cm] 
    4141 
    4242    """ 
     
    5252        self.name = "CoreShellModel" 
    5353        ## Model description 
    54         self.description =""" Form factor for a monodisperse spherical 
     54        self.description =""" Form factor for a monodisperse spherical particle with 
    5555                particle with a core-shell structure: 
    5656                The form factor is normalized by the 
     
    6666        self.details = {} 
    6767        self.details['scale'] = ['', None, None] 
    68         self.details['radius'] = ['A', None, None] 
    69         self.details['thickness'] = ['A', None, None] 
    70         self.details['core_sld'] = ['A-2', None, None] 
    71         self.details['shell_sld'] = ['A-2', None, None] 
    72         self.details['solvent_sld'] = ['A-2', None, None] 
    73         self.details['background'] = ['cm-1', None, None] 
     68        self.details['radius'] = ['[Å]', None, None] 
     69        self.details['thickness'] = ['[Å]', None, None] 
     70        self.details['core_sld'] = ['[1/Ų]', None, None] 
     71        self.details['shell_sld'] = ['[1/Ų]', None, None] 
     72        self.details['solvent_sld'] = ['[1/Ų]', None, None] 
     73        self.details['background'] = ['[1/cm]', None, None] 
    7474 
    7575                ## fittable parameters 
  • sansmodels/src/sans/models/CylinderModel.py

    r25a608f5 r0824909  
    3333        List of default parameters: 
    3434         scale           = 1.0  
    35          radius          = 20.0 A 
    36          length          = 400.0 A 
    37          contrast        = 3e-006 A-2 
    38          background      = 0.0 cm-1 
    39          cyl_theta       = 1.0 rad 
    40          cyl_phi         = 1.0 rad 
     35         radius          = 20.0 [Å] 
     36         length          = 400.0 [Å] 
     37         contrast        = 3e-006 [1/Ų] 
     38         background      = 0.0 [1/cm] 
     39         cyl_theta       = 1.0 [rad] 
     40         cyl_phi         = 1.0 [rad] 
    4141 
    4242    """ 
     
    5353        ## Model description 
    5454        self.description ="""P(q,alpha)= scale/V*f(q)^(2)+bkg 
    55                 f(q)= 2*(scatter_sld - solvent_sld)*V*sin(qLcos(alpha/2))/[qLcos(alpha/2)]* 
    56                 J1(qRsin(alpha/2))/[qRsin(alpha)] 
     55                f(q)= 2*(scatter_sld - solvent_sld)*V 
     56                *sin(qLcos(alpha/2))/[qLcos(alpha/2)] 
     57                *J1(qRsin(alpha/2))/[qRsin(alpha)] 
    5758                V: Volume of the cylinder 
    5859                R: Radius of the cylinder 
    5960                L: Length of the cylinder 
    6061                J1: The bessel function 
    61                 alpha: angle betweenthe axis of the cylinder and the q-vector 
    62                 for 1D:the ouput is P(q)=scale/V*integral from pi/2 to zero of f(q)^(2)* 
    63                 sin(alpha)*dalpha+ bkg""" 
     62                alpha: angle betweenthe axis of the cylinder 
     63                and the q-vector for 1D:the ouput is 
     64                P(q)=scale/V*integral from pi/2 to zero of 
     65                f(q)^(2)*sin(alpha)*dalpha+ bkg""" 
    6466        
    6567                ## Parameter details [units, min, max] 
    6668        self.details = {} 
    6769        self.details['scale'] = ['', None, None] 
    68         self.details['radius'] = ['A', None, None] 
    69         self.details['length'] = ['A', None, None] 
    70         self.details['contrast'] = ['A-2', None, None] 
    71         self.details['background'] = ['cm-1', None, None] 
    72         self.details['cyl_theta'] = ['rad', None, None] 
    73         self.details['cyl_phi'] = ['rad', None, None] 
     70        self.details['radius'] = ['[Å]', None, None] 
     71        self.details['length'] = ['[Å]', None, None] 
     72        self.details['contrast'] = ['[1/Ų]', None, None] 
     73        self.details['background'] = ['[1/cm]', None, None] 
     74        self.details['cyl_theta'] = ['[rad]', None, None] 
     75        self.details['cyl_phi'] = ['[rad]', None, None] 
    7476 
    7577                ## fittable parameters 
  • sansmodels/src/sans/models/DABModel.py

    r988130c6 r0824909  
    4343        ## Parameter details [units, min, max] 
    4444        self.details = {} 
    45         self.details['length']            = ['', None, None] 
     45        self.details['length']            = ['[Å]', None, None] 
    4646        self.details['scale']             = ['', None, None] 
    47         self.details['background']        = ['', None, None] 
     47        self.details['background']        = ['[1/cm]', None, None] 
    4848        #list of parameter that cannot be fitted 
    4949        self.fixed= []       
  • sansmodels/src/sans/models/DebyeModel.py

    r988130c6 r0824909  
    4848        ## Parameter details [units, min, max] 
    4949        self.details = {} 
    50         self.details['rg']         = ['', None, None] 
     50        self.details['rg']         = ['[Å]', None, None] 
    5151        self.details['scale']      = ['', None, None] 
    52         self.details['background'] = ['', None, None] 
     52        self.details['background'] = ['[1/cm]', None, None] 
    5353        #list of parameter that cannot be fitted 
    5454        self.fixed= []       
  • sansmodels/src/sans/models/DiamCylFunc.py

    r40945a3 r0824909  
    1717 
    1818        WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 
    19                  DO NOT MODIFY THIS FILE, MODIFY C:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\DiamCyl.h 
     19                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\DiamCyl.h 
    2020                 AND RE-RUN THE GENERATOR SCRIPT 
    2121 
     
    2828class DiamCylFunc(CDiamCylFunc, BaseComponent): 
    2929    """ Class that evaluates a DiamCylFunc model.  
    30         This file was auto-generated from C:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\DiamCyl.h. 
     30        This file was auto-generated from ..\c_extensions\DiamCyl.h. 
    3131        Refer to that file and the structure it contains 
    3232        for details of the model. 
     
    5959                ## fittable parameters 
    6060        self.fixed=['radius.width', 'length.width'] 
     61         
     62        ## parameters with orientation 
     63        self.orientation_params =[] 
    6164    
    6265    def clone(self): 
  • sansmodels/src/sans/models/EllipsoidModel.py

    r25a608f5 r0824909  
    3333        List of default parameters: 
    3434         scale           = 1.0  
    35          radius_a        = 20.0 A 
    36          radius_b        = 400.0 A 
    37          contrast        = 3e-006 A-2 
    38          background      = 0.0 cm-1 
    39          axis_theta      = 1.57 rad 
    40          axis_phi        = 0.0 rad 
     35         radius_a        = 20.0 [Å] 
     36         radius_b        = 400.0 [Å] 
     37         contrast        = 3e-006 [1/Ų] 
     38         background      = 0.0 [1/cm] 
     39         axis_theta      = 1.57 [rad] 
     40         axis_phi        = 0.0 [rad] 
    4141 
    4242    """ 
     
    5252        self.name = "EllipsoidModel" 
    5353        ## Model description 
    54         self.description =""""P(q.alpha)= scale*f(q)^(2)+ bkg\n\ 
    55                 f(q)= 3*(scatter_sld- scatter_solvent)*V*[sin(q*r(Ra,Rb,alpha)) - q*r*cos(qr(Ra,Rb,alpha))] 
     54        self.description =""""P(q.alpha)= scale*f(q)^(2)+ bkg 
     55                f(q)= 3*(scatter_sld- scatter_solvent)*V 
     56                *[sin(q*r(Ra,Rb,alpha))- q*r*cos(qr(Ra,Rb,alpha))] 
    5657                /[qr(Ra,Rb,alpha)]^(3)" 
    57                 r(Ra,Rb,alpha)= [Rb^(2)*(sin(alpha))^(2) + Ra^(2)*(cos(alpha))^(2)]^(1/2) 
     58                r(Ra,Rb,alpha)= [Rb^(2)*(sin(alpha))^(2) 
     59                + Ra^(2)*(cos(alpha))^(2)]^(1/2) 
    5860                scatter_sld: scattering length density of the scatter 
    5961                solvent_sld: scattering length density of the solvent 
     
    6567        self.details = {} 
    6668        self.details['scale'] = ['', None, None] 
    67         self.details['radius_a'] = ['A', None, None] 
    68         self.details['radius_b'] = ['A', None, None] 
    69         self.details['contrast'] = ['A-2', None, None] 
    70         self.details['background'] = ['cm-1', None, None] 
    71         self.details['axis_theta'] = ['rad', None, None] 
    72         self.details['axis_phi'] = ['rad', None, None] 
     69        self.details['radius_a'] = ['[Å]', None, None] 
     70        self.details['radius_b'] = ['[Å]', None, None] 
     71        self.details['contrast'] = ['[1/Ų]', None, None] 
     72        self.details['background'] = ['[1/cm]', None, None] 
     73        self.details['axis_theta'] = ['[rad]', None, None] 
     74        self.details['axis_phi'] = ['[rad]', None, None] 
    7375 
    7476                ## fittable parameters 
  • sansmodels/src/sans/models/EllipticalCylinderModel.py

    r25a608f5 r0824909  
    3333        List of default parameters: 
    3434         scale           = 1.0  
    35          r_minor         = 20.0 A 
    36          r_ratio         = 1.5 A 
    37          length          = 400.0 A 
    38          contrast        = 3e-006 A-2 
    39          background      = 0.0 cm-1 
    40          cyl_theta       = 1.57 rad 
    41          cyl_phi         = 0.0 rad 
    42          cyl_psi         = 0.0 rad 
     35         r_minor         = 20.0 [Å] 
     36         r_ratio         = 1.5  
     37         length          = 400.0 [Å] 
     38         contrast        = 3e-006 [1/Ų] 
     39         background      = 0.0 [1/cm] 
     40         cyl_theta       = 1.57 [rad] 
     41         cyl_phi         = 0.0 [rad] 
     42         cyl_psi         = 0.0 [rad] 
    4343 
    4444    """ 
     
    5454        self.name = "EllipticalCylinderModel" 
    5555        ## Model description 
    56         self.description ="""""""" 
     56        self.description ="""Please see details...""" 
    5757        
    5858                ## Parameter details [units, min, max] 
    5959        self.details = {} 
    6060        self.details['scale'] = ['', None, None] 
    61         self.details['r_minor'] = ['A', None, None] 
    62         self.details['r_ratio'] = ['A', None, None] 
    63         self.details['length'] = ['A', None, None] 
    64         self.details['contrast'] = ['A-2', None, None] 
    65         self.details['background'] = ['cm-1', None, None] 
    66         self.details['cyl_theta'] = ['rad', None, None] 
    67         self.details['cyl_phi'] = ['rad', None, None] 
    68         self.details['cyl_psi'] = ['rad', None, None] 
     61        self.details['r_minor'] = ['[Å]', None, None] 
     62        self.details['r_ratio'] = ['', None, None] 
     63        self.details['length'] = ['[Å]', None, None] 
     64        self.details['contrast'] = ['[1/Ų]', None, None] 
     65        self.details['background'] = ['[1/cm]', None, None] 
     66        self.details['cyl_theta'] = ['[rad]', None, None] 
     67        self.details['cyl_phi'] = ['[rad]', None, None] 
     68        self.details['cyl_psi'] = ['[rad]', None, None] 
    6969 
    7070                ## fittable parameters 
  • sansmodels/src/sans/models/FractalModel.py

    r7292e8a r0824909  
    6262        self.details = {} 
    6363        self.details['scale']       = ['',     None, None] 
    64         self.details['radius']      = ['A',    None, None] 
     64        self.details['radius']      = ['[Å]',    None, None] 
    6565        self.details['fractal_dim'] = ['',       0,  None] 
    66         self.details['corr_length'] = ['A',    None, None] 
    67         self.details['block_sld']   = ['A-2',  None, None] 
    68         self.details['solvent_sld'] = ['A-2',  None, None] 
    69         self.details['background']  = ['cm-1', None, None] 
     66        self.details['corr_length'] = ['[Å]',    None, None] 
     67        self.details['block_sld']   = ['[1/Ų]',  None, None] 
     68        self.details['solvent_sld'] = ['[1/Ų]',  None, None] 
     69        self.details['background']  = ['[1/cm]', None, None] 
    7070        
    7171                
  • sansmodels/src/sans/models/GuinierModel.py

    r800fc80 r0824909  
    3939        ## Parameter details [units, min, max] 
    4040        self.details = {} 
    41         self.details['scale'] = ['cm-1', None, None] 
    42         self.details['rg']    = ['A', None, None] 
     41        self.details['scale'] = ['[1/cm]', None, None] 
     42        self.details['rg']    = ['[Å]', None, None] 
    4343        #list of parameter that cannot be fitted 
    4444        self.fixed= []   
  • sansmodels/src/sans/models/HardsphereStructure.py

    r1bbf2ac r0824909  
    1717 
    1818        WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 
    19                  DO NOT MODIFY THIS FILE, MODIFY c:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\Hardsphere.h 
     19                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\Hardsphere.h 
    2020                 AND RE-RUN THE GENERATOR SCRIPT 
    2121 
     
    2828class HardsphereStructure(CHardsphereStructure, BaseComponent): 
    2929    """ Class that evaluates a HardsphereStructure model.  
    30         This file was auto-generated from c:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\Hardsphere.h. 
     30        This file was auto-generated from ..\c_extensions\Hardsphere.h. 
    3131        Refer to that file and the structure it contains 
    3232        for details of the model. 
    3333        List of default parameters: 
    34          radius          = 50.0 A 
     34         radius          = 50.0 [Å] 
    3535         volfraction     = 0.2  
    3636 
     
    6262                ## Parameter details [units, min, max] 
    6363        self.details = {} 
    64         self.details['radius'] = ['A', None, None] 
     64        self.details['radius'] = ['[Å]', None, None] 
    6565        self.details['volfraction'] = ['', None, None] 
    6666 
    6767                ## fittable parameters 
    6868        self.fixed=['radius.width'] 
     69         
     70        ## parameters with orientation 
     71        self.orientation_params =[] 
    6972    
    7073    def clone(self): 
  • sansmodels/src/sans/models/HayterMSAStructure.py

    rd3bbf84 r0824909  
    1717 
    1818        WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 
    19                  DO NOT MODIFY THIS FILE, MODIFY C:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\HayterMSA.h 
     19                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\HayterMSA.h 
    2020                 AND RE-RUN THE GENERATOR SCRIPT 
    2121 
     
    2828class HayterMSAStructure(CHayterMSAStructure, BaseComponent): 
    2929    """ Class that evaluates a HayterMSAStructure model.  
    30         This file was auto-generated from C:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\HayterMSA.h. 
     30        This file was auto-generated from ..\c_extensions\HayterMSA.h. 
    3131        Refer to that file and the structure it contains 
    3232        for details of the model. 
    3333        List of default parameters: 
    34          radius          = 20.75 A 
     34         radius          = 20.75 [Å] 
    3535         charge          = 19.0  
    3636         volfraction     = 0.0192  
    37          temperature     = 318.16 K 
    38          saltconc        = 0.0  
     37         temperature     = 318.16 [K] 
     38         saltconc        = 0.0 [M] 
    3939         dielectconst    = 71.08  
    4040 
     
    6767                ## Parameter details [units, min, max] 
    6868        self.details = {} 
    69         self.details['radius'] = ['A', None, None] 
     69        self.details['radius'] = ['[Å]', None, None] 
    7070        self.details['charge'] = ['', None, None] 
    7171        self.details['volfraction'] = ['', None, None] 
    72         self.details['temperature'] = ['K', None, None] 
    73         self.details['saltconc'] = ['', None, None] 
     72        self.details['temperature'] = ['[K]', None, None] 
     73        self.details['saltconc'] = ['[M]', None, None] 
    7474        self.details['dielectconst'] = ['', None, None] 
    7575 
    7676                ## fittable parameters 
    7777        self.fixed=['radius.width'] 
     78         
     79        ## parameters with orientation 
     80        self.orientation_params =[] 
    7881    
    7982    def clone(self): 
  • sansmodels/src/sans/models/LorentzModel.py

    r988130c6 r0824909  
    4242        ## Parameter details [units, min, max] 
    4343        self.details = {} 
    44         self.details['length']     = ['A', None, None] 
     44        self.details['length']     = ['[Å]', None, None] 
    4545        self.details['scale']      = ['', None, None] 
    46         self.details['background'] = ['cm-1', None, None] 
     46        self.details['background'] = ['[1/cm]', None, None] 
    4747        #list of parameter that cannot be fitted 
    4848        self.fixed= []       
  • sansmodels/src/sans/models/PorodModel.py

    r988130c6 r0824909  
    3333        ## Parameter details [units, min, max] 
    3434        self.details = {} 
    35         self.details['scale']      = ['', None, None] 
    36         self.details['background'] = ['', None, None] 
     35        self.details['scale']      = ['[1/Å^4]', None, None] 
     36        self.details['background'] = ['[1/cm]', None, None] 
    3737        #list of parameter that cannot be fitted 
    3838        self.fixed= [] 
  • sansmodels/src/sans/models/PowerLawModel.py

    rf0ffb873 r0824909  
    4545        self.details['m']           = ['', 0,    None] 
    4646        self.details['scale']       = ['', None, None] 
    47         self.details['background']  = ['', None, None] 
     47        self.details['background']  = ['[1/cm]', None, None] 
    4848        #list of parameter that cannot be fitted 
    4949        self.fixed= []     
  • sansmodels/src/sans/models/SphereModel.py

    r25a608f5 r0824909  
    3333        List of default parameters: 
    3434         scale           = 1.0  
    35          radius          = 60.0 A 
    36          contrast        = 1e-006 A-2 
    37          background      = 0.0 cm-1 
     35         radius          = 60.0 [Å] 
     36         contrast        = 1e-006 [1/Ų] 
     37         background      = 0.0 [1/cm] 
    3838 
    3939    """ 
     
    4949        self.name = "SphereModel" 
    5050        ## Model description 
    51         self.description ="""P(q)=(scale/V)*[3V(scatter_sld-solvent_sld)*(sin(qR)-qRcos(qR))/(qR)^3]^(2) 
     51        self.description ="""P(q)=(scale/V) 
     52                *[3V(scatter_sld-solvent_sld)*(sin(qR)-qRcos(qR))/(qR)^3]^(2) 
    5253                +bkg 
    5354                bkg: background level 
     
    6061        self.details = {} 
    6162        self.details['scale'] = ['', None, None] 
    62         self.details['radius'] = ['A', None, None] 
    63         self.details['contrast'] = ['A-2', None, None] 
    64         self.details['background'] = ['cm-1', None, None] 
     63        self.details['radius'] = ['[Å]', None, None] 
     64        self.details['contrast'] = ['[1/Ų]', None, None] 
     65        self.details['background'] = ['[1/cm]', None, None] 
    6566 
    6667                ## fittable parameters 
  • sansmodels/src/sans/models/SquareWellStructure.py

    r1bbf2ac r0824909  
    1717 
    1818        WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 
    19                  DO NOT MODIFY THIS FILE, MODIFY c:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\SquareWell.h 
     19                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\SquareWell.h 
    2020                 AND RE-RUN THE GENERATOR SCRIPT 
    2121 
     
    2828class SquareWellStructure(CSquareWellStructure, BaseComponent): 
    2929    """ Class that evaluates a SquareWellStructure model.  
    30         This file was auto-generated from c:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\SquareWell.h. 
     30        This file was auto-generated from ..\c_extensions\SquareWell.h. 
    3131        Refer to that file and the structure it contains 
    3232        for details of the model. 
    3333        List of default parameters: 
    34          radius          = 50.0 A 
     34         radius          = 50.0 [Å] 
    3535         volfraction     = 0.04  
    36          welldepth       = 1.5 kT 
     36         welldepth       = 1.5 [kT] 
    3737         wellwidth       = 1.2  
    3838 
     
    6666                ## Parameter details [units, min, max] 
    6767        self.details = {} 
    68         self.details['radius'] = ['A', None, None] 
     68        self.details['radius'] = ['[Å]', None, None] 
    6969        self.details['volfraction'] = ['', None, None] 
    70         self.details['welldepth'] = ['kT', None, None] 
     70        self.details['welldepth'] = ['[kT]', None, None] 
    7171        self.details['wellwidth'] = ['', None, None] 
    7272 
    7373                ## fittable parameters 
    7474        self.fixed=['radius.width'] 
     75         
     76        ## parameters with orientation 
     77        self.orientation_params =[] 
    7578    
    7679    def clone(self): 
  • sansmodels/src/sans/models/StickyHSStructure.py

    r1bbf2ac r0824909  
    1717 
    1818        WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY 
    19                  DO NOT MODIFY THIS FILE, MODIFY c:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\StickyHS.h 
     19                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\StickyHS.h 
    2020                 AND RE-RUN THE GENERATOR SCRIPT 
    2121 
     
    2828class StickyHSStructure(CStickyHSStructure, BaseComponent): 
    2929    """ Class that evaluates a StickyHSStructure model.  
    30         This file was auto-generated from c:\ECLPS\workspace\trunk\sansmodels\src\sans\models\c_extensions\StickyHS.h. 
     30        This file was auto-generated from ..\c_extensions\StickyHS.h. 
    3131        Refer to that file and the structure it contains 
    3232        for details of the model. 
    3333        List of default parameters: 
    34          radius          = 50.0 A 
     34         radius          = 50.0 [Å] 
    3535         volfraction     = 0.1  
    3636         perturb         = 0.05  
     
    6868                ## Parameter details [units, min, max] 
    6969        self.details = {} 
    70         self.details['radius'] = ['A', None, None] 
     70        self.details['radius'] = ['[Å]', None, None] 
    7171        self.details['volfraction'] = ['', None, None] 
    7272        self.details['perturb'] = ['', None, None] 
     
    7575                ## fittable parameters 
    7676        self.fixed=['radius.width'] 
     77         
     78        ## parameters with orientation 
     79        self.orientation_params =[] 
    7780    
    7881    def clone(self): 
  • sansmodels/src/sans/models/TeubnerStreyModel.py

    r988130c6 r0824909  
    5050        self.details['c2']    = ['', None, None ] 
    5151        self.details['scale'] = ['', None, None] 
    52         self.details['background']   = ['', None, None] 
     52        self.details['background']   = ['[1/cm]', None, None] 
    5353        #list of parameter that cannot be fitted 
    5454        self.fixed= [] 
Note: See TracChangeset for help on using the changeset viewer.