Changeset 9188cc1 in sasview for sansmodels


Ignore:
Timestamp:
Aug 4, 2009 4:29:56 PM (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:
8344c50
Parents:
8dc0b746
Message:

corrected bkg values for polydispersity cal and add doc

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

Legend:

Unmodified
Added
Removed

  • sansmodels/src/sans/models/LamellarPSHGModel.py

    r27a0771 r9188cc1  
    5555        self.name = "LamellarPSHGModel" 
    5656        ## Model description 
    57         self.description =""" Calculates the scattered intensity from a concentrated lamellar phase""" 
     57        self.description ="""[Concentrated Lamellar (head+tail) Form Factor]: Calculates the 
     58                intensity from a lyotropic lamellar phase. 
     59                The intensity (form factor and structure factor) 
     60                calculated is for lamellae of two-layer scattering 
     61                length density that are randomly distributed in 
     62                solution (a powder average). The scattering 
     63                length density of the tail region, headgroup 
     64                region, and solvent are taken to be different. 
     65                The model can also be applied to large, 
     66                multi-lamellar vesicles. 
     67                No resolution smeared version is included 
     68                in the structure factor of this model. 
     69                *Parameters: spacing = repeat spacing, 
     70                deltaT = tail length, 
     71                deltaH = headgroup thickness, 
     72                n_plates = # of Lamellar plates 
     73                caille = Caille parameter (<0.8 or <1) 
     74                background = incoherent bgd 
     75                scale = scale factor ...""" 
    5876        
    5977                ## Parameter details [units, min, max] 
    … …  
    7189 
    7290                ## fittable parameters 
    73         self.fixed=['deltaT.with', 'deltaH.with'] 
     91        self.fixed=['deltaT.width', 'deltaH.width', 'spacing.width'] 
    7492         
    7593        ## parameters with orientation 

  • sansmodels/src/sans/models/LamellarPSModel.py

    rfbe5d3e r9188cc1  
    5353        self.name = "LamellarPSModel" 
    5454        ## Model description 
    55         self.description ="""Calculates the scattered intensity from a lyotropic lamellar phase. 
    56                 The intensity (form factor and structure factor) 
    57                 calculated is for lamellae of uniform scattering 
    58                 length density that are randomly distributed in 
    59                 solution (a powder average). The lamellae 
    60                 thickness is polydisperse. The model can also 
     55        self.description ="""[Concentrated Lamellar Form Factor] Calculates the scattered 
     56                intensity from a lyotropic lamellar phase. 
     57                The intensity (form factor and structure 
     58                factor)calculated is for lamellae of 
     59                uniform scattering length density that 
     60                are randomly distributed in solution 
     61                (a powder average). The lamellae thickness 
     62                is polydisperse. The model can also 
    6163                be applied to large, multi-lamellar vesicles. 
    6264                No resolution smeared version is included 
    … …  
    8385 
    8486                ## fittable parameters 
    85         self.fixed=['spacing.with'] 
     87        self.fixed=['spacing.width'] 
    8688         
    8789        ## parameters with orientation 

  • sansmodels/src/sans/models/OblateModel.py

    r27a0771 r9188cc1  
    5555        self.name = "OblateModel" 
    5656        ## Model description 
    57         self.description =""" Calculates the form factor for an oblate ellipsoid particle with a core/shell structure. 
    58                 Note:It is the users' responsibility to ensure that shell radii are larger than core radii, and""" 
     57        self.description ="""[OblateCoreShellModel] Calculates the form factor for an oblate 
     58                ellipsoid particle with a core_shell structure. 
     59                The form factor is averaged over all possible 
     60                orientations of the ellipsoid such that P(q) 
     61                = scale*<f^2>/Vol + bkg, where f is the 
     62                single particle scattering amplitude. 
     63                [Parameters]: 
     64                major_core = radius of major_core, 
     65                minor_core = radius of minor_core, 
     66                major_shell = radius of major_shell, 
     67                minor_shell = radius of minor_shell, 
     68                contrast = SLD_core - SLD_shell 
     69                sld_solvent = SLD_solvent 
     70                background = Incoherent bkg 
     71                scale =scale 
     72                Note:It is the users' responsibility to ensure 
     73                that shell radii are larger than core radii.""" 
    5974        
    6075                ## Parameter details [units, min, max] 
    … …  
    7287 
    7388                ## fittable parameters 
    74         self.fixed=['axis_phi.width', 'axis_theta.width', 'major_core.width', 'minor_core.width', 'major_shell', 'minor_shell'] 
     89        self.fixed=['major_core.width', 'minor_core.width', 'major_shell.width', 'minor_shell.width'] 
    7590         
    7691        ## parameters with orientation 
    77         self.orientation_params =['axis_phi', 'axis_theta', 'axis_phi.width', 'axis_theta.width'] 
     92        self.orientation_params =[] 
    7893    
    7994    def clone(self): 

  • sansmodels/src/sans/models/ProlateModel.py

    r72a90bd r9188cc1  
    4040         sld_solvent     = 6.3e-006 [1/A²] 
    4141         background      = 0.001 [1/cm] 
    42          axis_theta      = 1.0 [rad] 
    43          axis_phi        = 1.0 [rad] 
    4442 
    4543    """ 
    … …  
    5553        self.name = "ProlateModel" 
    5654        ## Model description 
    57         self.description =""" Calculates the form factor for a monodisperse prolate ellipsoid particle with a 
    58                 core/shell structure 
    59                 Note:It is the users' responsibility to ensure that shell radii are larger than core radii, and""" 
     55        self.description ="""[ProlateCoreShellModel] Calculates the form factor for a prolate 
     56                ellipsoid particle with a core_shell structure. 
     57                The form factor is averaged over all possible 
     58                orientations of the ellipsoid such that P(q) 
     59                = scale*<f^2>/Vol + bkg, where f is the 
     60                single particle scattering amplitude. 
     61                [Parameters]: 
     62                major_core = radius of major_core, 
     63                minor_core = radius of minor_core, 
     64                major_shell = radius of major_shell, 
     65                minor_shell = radius of minor_shell, 
     66                contrast = SLD_core - SLD_shell 
     67                sld_solvent = SLD_solvent 
     68                background = Incoherent bkg 
     69                scale = scale 
     70                Note:It is the users' responsibility to ensure 
     71                that shell radii are larger than core radii.""" 
    6072        
    6173                ## Parameter details [units, min, max] 
    … …  
    6981        self.details['sld_solvent'] = ['[1/A²]', None, None] 
    7082        self.details['background'] = ['[1/cm]', None, None] 
    71         self.details['axis_theta'] = ['[rad]', None, None] 
    72         self.details['axis_phi'] = ['[rad]', None, None] 
    7383 
    7484                ## fittable parameters 
    75         self.fixed=['axis_phi.width', 'axis_theta.width', 'major_core.width', 'minor_core.width', 'major_shell', 'minor_shell'] 
     85        self.fixed=['major_core.width', 'minor_core.width', 'major_shell.width', 'minor_shell.width'] 
    7686         
    7787        ## parameters with orientation 
    78         self.orientation_params =['axis_phi', 'axis_theta', 'axis_phi.width', 'axis_theta.width'] 
     88        self.orientation_params =[] 
    7989    
    8090    def clone(self): 

  • sansmodels/src/sans/models/c_models/binaryHS.cpp

    r3d25331f r9188cc1  
    3131 
    3232BinaryHSModel :: BinaryHSModel() { 
    33          
     33 
    3434        l_radius     = Parameter(160.0, true); 
    3535        l_radius.set_min(0.0); 
    … …  
    6262        dp[5] = ss_sld(); 
    6363        dp[6] = solvent_sld(); 
    64         dp[7] = background(); 
    65          
     64        dp[7] = 0.0; 
     65 
    6666 
    6767        // Get the dispersion points for the large radius 
    … …  
    8080        for(int i=0; i< (int)weights_l_radius.size(); i++) { 
    8181                dp[0] = weights_l_radius[i].value; 
    82                  
     82 
    8383                // Loop over small radius weight points 
    8484                for(int j=0; j< (int)weights_s_radius.size(); j++) { 

  • sansmodels/src/sans/models/c_models/binaryHS_PSF11.cpp

    r2c4b289 r9188cc1  
    3131 
    3232BinaryHSPSF11Model :: BinaryHSPSF11Model() { 
    33          
     33 
    3434        l_radius     = Parameter(160.0, true); 
    3535        l_radius.set_min(0.0); 
    … …  
    6262        dp[5] = ss_sld(); 
    6363        dp[6] = solvent_sld(); 
    64         dp[7] = background(); 
    65          
     64        dp[7] = 0.0; 
     65 
    6666 
    6767        // Get the dispersion points for the large radius 
    … …  
    8080        for(int i=0; i< (int)weights_l_radius.size(); i++) { 
    8181                dp[0] = weights_l_radius[i].value; 
    82                  
     82 
    8383                // Loop over small radius weight points 
    8484                for(int j=0; j< (int)weights_s_radius.size(); j++) { 

  • sansmodels/src/sans/models/c_models/hollowcylinder.cpp

    r27fea3f r9188cc1  
    6060        dp[3] = length(); 
    6161        dp[4] = contrast(); 
    62         dp[5] = background(); 
     62        dp[5] = 0.0; 
    6363 
    6464        // Get the dispersion points for the core radius 
    … …  
    117117        dp.length     = length(); 
    118118        dp.contrast   = contrast(); 
    119         dp.background = background(); 
     119        dp.background = 0.0; 
    120120        dp.axis_theta = axis_theta(); 
    121121        dp.axis_phi   = axis_phi(); 

  • sansmodels/src/sans/models/c_models/stackeddisks.cpp

    r5068697 r9188cc1  
    1919 * 
    2020 *      TODO: refactor so that we pull in the old sansmodels.c_extensions 
    21  *      TODO: add 2d  
     21 *      TODO: add 2d 
    2222 */ 
    2323 
    … …  
    7171        dp[7] = nlayers(); 
    7272        dp[8] = spacing(); 
    73         dp[9] = background(); 
     73        dp[9] = 0.0; 
    7474 
    7575        // Get the dispersion points for the length 
    … …  
    129129        dp.nlayers        = nlayers(); 
    130130        dp.spacing    = spacing(); 
    131         dp.background = background(); 
     131        dp.background = 0.0; 
    132132        dp.axis_theta = axis_theta(); 
    133133        dp.axis_phi   = axis_phi(); 

  • sansmodels/src/sans/models/c_models/triaxialellipsoid.cpp

    r5068697 r9188cc1  
    6262        dp[3] = semi_axisC(); 
    6363        dp[4] = contrast(); 
    64         dp[5] = background(); 
     64        dp[5] = 0.0; 
    6565 
    6666        // Get the dispersion points for the semi axis A 

  • sansmodels/src/sans/models/c_models/vesicle.cpp

    r42f193a r9188cc1  
    5757        dp[3] = core_sld(); 
    5858        dp[4] = shell_sld(); 
    59         dp[5] = background(); 
     59        dp[5] = 0.0; 
    6060 
    6161 
Note: See TracChangeset for help on using the changeset viewer.