Changeset 34c3020 in sasview for sansmodels/src/sans
- Timestamp:
- Jul 1, 2009 10:53:38 AM (15 years ago)
- 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:
- e65050e
- Parents:
- 72a90bd
- Location:
- sansmodels/src/sans/models
- Files:
-
- 11 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_extensions/c_models.c
r27a0771 r34c3020 46 46 addCProlateModel(m); 47 47 addCOblateModel(m); 48 addCLamellarModel(m); 49 addCLamellarFFHGModel(m); 48 50 addDisperser(m); 49 51 addCGaussian(m); -
sansmodels/src/sans/models/c_extensions/triaxial_ellipsoid.c
r5068697 r34c3020 18 18 */ 19 19 double triaxial_ellipsoid_analytical_1D(TriaxialEllipsoidParameters *pars, double q) { 20 double dp[ 5];20 double dp[6]; 21 21 22 22 // Fill paramater array -
sansmodels/src/sans/models/c_models/c_models.cpp
r27a0771 r34c3020 29 29 void addCOblateModel(PyObject *module); 30 30 void addCProlateModel(PyObject *module); 31 void addCLamellarModel(PyObject *module); 32 void addCLamellarFFHGModel(PyObject *module); 31 33 32 34 … … 177 179 addCOblateModel(m); 178 180 addCProlateModel(m); 179 181 addCLamellarModel(m); 182 addCLamellarFFHGModel(m); 180 183 addDisperser(m); 181 184 addCGaussian(m); -
sansmodels/src/sans/models/c_models/models.hh
r27a0771 r34c3020 332 332 double evaluate_rphi(double q, double phi); 333 333 }; 334 335 class LamellarModel{ 336 public: 337 // Model parameters 338 Parameter scale; 339 Parameter delta; 340 Parameter sigma; 341 Parameter contrast; 342 Parameter background; 343 344 // Constructor 345 LamellarModel(); 346 347 // Operators to get I(Q) 348 double operator()(double q); 349 double operator()(double qx, double qy); 350 double evaluate_rphi(double q, double phi); 351 352 }; 353 354 class LamellarFFHGModel{ 355 public: 356 // Model parameters 357 Parameter scale; 358 Parameter t_length; 359 Parameter h_thickness; 360 Parameter sld_tail; 361 Parameter sld_head; 362 Parameter sld_solvent; 363 Parameter background; 364 365 // Constructor 366 LamellarFFHGModel(); 367 368 // Operators to get I(Q) 369 double operator()(double q); 370 double operator()(double qx, double qy); 371 double evaluate_rphi(double q, double phi); 372 373 }; 374 375 334 376 335 377 class LamellarPSModel{
Note: See TracChangeset
for help on using the changeset viewer.