Changeset d5b6a9d in sasview for sansmodels/src/sans/models
- Timestamp:
- Oct 8, 2010 4:42:07 PM (14 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:
- d2d815d
- Parents:
- 94a3f8f
- Location:
- sansmodels/src/sans/models
- Files:
-
- 15 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/SCCrystalModel.py
r94a3f8f rd5b6a9d 67 67 Z(q)= paracrystalline structure factor 68 68 for a simple cubic structure. 69 [Simple Cubic ParaCrystal Model] 69 70 Parameters; 70 71 scale: volume fraction of spheres -
sansmodels/src/sans/models/c_extensions/sc.c
r94a3f8f rd5b6a9d 60 60 double a3_x, a3_y, a3_z, a2_x, a2_y, a1_x, a1_y, a1_z; 61 61 double q_z; 62 double alpha, vol, cos_val_a3, cos_val_a2, cos_val_a1 , edgeA, edgeB, edgeC;62 double alpha, vol, cos_val_a3, cos_val_a2, cos_val_a1; 63 63 double a1_dot_q, a2_dot_q,a3_dot_q; 64 64 double answer; -
sansmodels/src/sans/models/c_extensions/sc.h
r94a3f8f rd5b6a9d 15 15 // Z(q)= paracrystalline structure factor 16 16 // for a simple cubic structure. 17 // [Simple Cubic ParaCrystal Model] 17 18 // Parameters; 18 19 // scale: volume fraction of spheres -
sansmodels/src/sans/models/c_models/c_models.cpp
r94a3f8f rd5b6a9d 21 21 void addCStickyHSStructure(PyObject *module); 22 22 void addCSCCrystalModel(PyObject *module); 23 void addCFCCrystalModel(PyObject *module); 24 void addCBCCrystalModel(PyObject *module); 23 25 void addCSquareWellStructure(PyObject *module); 24 26 void addCHayterMSAStructure(PyObject *module); … … 34 36 void addCLamellarPSModel(PyObject *module); 35 37 void addCLamellarPSHGModel(PyObject *module); 38 void addCLamellarPCrystalModel(PyObject *module); 36 39 void addCCoreShellEllipsoidModel(PyObject *module); 37 40 void addCDiamEllipFunc(PyObject *module); … … 231 234 addCStickyHSStructure(m); 232 235 addCSCCrystalModel(m); 236 addCFCCrystalModel(m); 237 addCBCCrystalModel(m); 233 238 addCSquareWellStructure(m); 234 239 addCHayterMSAStructure(m); … … 240 245 addCLamellarPSModel(m); 241 246 addCLamellarPSHGModel(m); 247 addCLamellarPCrystalModel(m); 242 248 addCCoreShellEllipsoidModel(m); 243 249 addCDiamEllipFunc(m); -
sansmodels/src/sans/models/c_models/models.hh
r94a3f8f rd5b6a9d 303 303 // Constructor 304 304 SCCrystalModel(); 305 306 // Operators to get I(Q) 307 double operator()(double q); 308 double operator()(double qx, double qy); 309 double calculate_ER(); 310 double evaluate_rphi(double q, double phi); 311 }; 312 313 314 class FCCrystalModel{ 315 public: 316 // Model parameters 317 Parameter scale; 318 Parameter dnn; 319 Parameter d_factor; 320 Parameter radius; 321 Parameter sldSph; 322 Parameter sldSolv; 323 Parameter background; 324 Parameter theta; 325 Parameter phi; 326 Parameter psi; 327 328 // Constructor 329 FCCrystalModel(); 330 331 // Operators to get I(Q) 332 double operator()(double q); 333 double operator()(double qx, double qy); 334 double calculate_ER(); 335 double evaluate_rphi(double q, double phi); 336 }; 337 338 339 class BCCrystalModel{ 340 public: 341 // Model parameters 342 Parameter scale; 343 Parameter dnn; 344 Parameter d_factor; 345 Parameter radius; 346 Parameter sldSph; 347 Parameter sldSolv; 348 Parameter background; 349 Parameter theta; 350 Parameter phi; 351 Parameter psi; 352 353 // Constructor 354 BCCrystalModel(); 305 355 306 356 // Operators to get I(Q) … … 736 786 }; 737 787 788 789 class LamellarPCrystalModel{ 790 public: 791 // Model parameters 792 Parameter scale; 793 Parameter thickness; 794 Parameter Nlayers; 795 Parameter spacing; 796 Parameter pd_spacing; 797 Parameter sld_layer; 798 Parameter sld_solvent; 799 Parameter background; 800 801 // Constructor 802 LamellarPCrystalModel(); 803 804 // Operators to get I(Q) 805 double operator()(double q); 806 double operator()(double qx, double qy); 807 double calculate_ER(); 808 double evaluate_rphi(double q, double phi); 809 }; 810 738 811 class CoreShellEllipsoidModel{ 739 812 public:
Note: See TracChangeset
for help on using the changeset viewer.