Changeset 8c8cb05 in sasview for sansmodels/src/sans/models


Ignore:
Timestamp:
Jul 22, 2011 6:35:48 PM (13 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:
ca153ba
Parents:
204d0fa
Message:

new model pre.

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

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_models/c_models.cpp

    r59b9b675 r8c8cb05  
    2020void addCSphereSLDModel(PyObject *module); 
    2121void addCOnionModel(PyObject *module); 
     22void addCPearlNecklaceModel(PyObject *module); 
    2223void addCReflModel(PyObject *module); 
    2324void addCReflAdvModel(PyObject *module); 
     
    282283        addCDiamCylFunc(m); 
    283284        addCSLDCalFunc(m); 
    284  
    285 //      addCOblateModel(m); 
    286 //      addCProlateModel(m); 
     285        addCPearlNecklaceModel(m); 
    287286        addCLamellarModel(m); 
    288287        addCLamellarFFHGModel(m); 
  • sansmodels/src/sans/models/c_models/models.hh

    r96656e3 r8c8cb05  
    562562 
    563563 
     564class PearlNecklaceModel{ 
     565public: 
     566        // Model parameters 
     567        Parameter scale; 
     568        Parameter radius; 
     569        Parameter edge_separation; 
     570        Parameter thick_string; 
     571        Parameter num_pearls; 
     572        Parameter sld_pearl; 
     573        Parameter sld_string; 
     574        Parameter sld_solv; 
     575        Parameter background; 
     576 
     577        // Constructor 
     578        PearlNecklaceModel(); 
     579 
     580        // Operators to get I(Q) 
     581        double operator()(double q); 
     582        double operator()(double qx, double qy); 
     583        double calculate_ER(); 
     584        double evaluate_rphi(double q, double phi); 
     585}; 
     586 
    564587class FCCrystalModel{ 
    565588public: 
Note: See TracChangeset for help on using the changeset viewer.