Changeset 27fea3f in sasview for sansmodels/src/sans


Ignore:
Timestamp:
Jul 7, 2009 2:45:06 PM (15 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:
793c988
Parents:
4331b05e
Message:

add a few models 1D

Location:
sansmodels/src/sans/models
Files:
5 added
4 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/sans/models/c_extensions/core_shell_cylinder.h

    r1ed3834 r27fea3f  
    3232 //             phi: the axis_phi of the cylinder... 
    3333 //             </text> 
    34  //[FIXED]= <text> axis_phi.width; axis_theta.width; length.width;radius.width; thickness_width</text> 
     34 //[FIXED]= <text> axis_phi.width; axis_theta.width; length.width;radius.width; thickness.width</text> 
    3535 //[ORIENTATION_PARAMS]= axis_phi; axis_theta;axis_phi.width; axis_theta.width 
    3636 

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

    r34c3020 r27fea3f  
    3131void addCLamellarModel(PyObject *module); 
    3232void addCLamellarFFHGModel(PyObject *module); 
     33void addCHollowCylinderModel(PyObject *module); 
    3334 
    3435 
    … …  
    181182        addCLamellarModel(m); 
    182183        addCLamellarFFHGModel(m); 
     184        addCHollowCylinderModel(m); 
    183185        addDisperser(m); 
    184186        addCGaussian(m); 
    185187        addCLorentzian(m); 
    186188 
     189 
    187190} 

  • sansmodels/src/sans/models/c_models/models.hh

    r34c3020 r27fea3f  
    463463        double evaluate_rphi(double q, double phi); 
    464464}; 
    465  
     465class HollowCylinderModel{ 
     466public: 
     467        // Model parameters 
     468        Parameter scale; 
     469        Parameter core_radius; 
     470        Parameter shell_radius; 
     471        Parameter length; 
     472        Parameter contrast; 
     473        Parameter background; 
     474        Parameter axis_theta; 
     475        Parameter axis_phi; 
     476         
     477        //Constructor 
     478        HollowCylinderModel(); 
     479         
     480        //Operators to get I(Q) 
     481        double operator()(double q); 
     482        double operator()(double qx , double qy); 
     483        double evaluate_rphi(double q, double phi); 
     484}; 
    466485#endif 

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

    r996fd35 r27fea3f  
    3131        else: 
    3232            return self.function(x) 
     33         
    3334    
    3435    def runXY(self, x = 0.0): 
Note: See TracChangeset for help on using the changeset viewer.