Changeset 27a0771 in sasview for sansmodels/src/sans/models/c_models
- Timestamp:
- Jul 1, 2009 2:56:57 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:
- 72a90bd
- Parents:
- 5068697
- Location:
- sansmodels/src/sans/models/c_models
- Files:
-
- 7 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_models/c_models.cpp
r5068697 r27a0771 9 9 10 10 void addCCylinderModel(PyObject *module); 11 void addCTriaxialEllipsoidModel(PyObject *module); 11 12 void addCParallelepipedModel(PyObject *module); 12 13 void addCSphereModel(PyObject *module); … … 24 25 void addCFlexibleCylinderModel(PyObject *module); 25 26 void addCStackedDisksModel(PyObject *module); 27 void addCLamellarPSModel(PyObject *module); 28 void addCLamellarPSHGModel(PyObject *module); 29 void addCOblateModel(PyObject *module); 30 void addCProlateModel(PyObject *module); 31 26 32 27 33 extern "C" { … … 167 173 addCFlexibleCylinderModel(m); 168 174 addCStackedDisksModel(m); 175 addCLamellarPSModel(m); 176 addCLamellarPSHGModel(m); 177 addCOblateModel(m); 178 addCProlateModel(m); 179 169 180 addDisperser(m); 170 181 addCGaussian(m); -
sansmodels/src/sans/models/c_models/lineparser.py
r25a608f5 r27a0771 125 125 if len(temp3+ temp4)==0: 126 126 ## [FIXED]= only one param 127 listtofill= [temp.lstrip().rstrip()] 127 if temp.lstrip().rstrip()!="": 128 listtofill= [temp.lstrip().rstrip()] 128 129 129 130 listtofill += temp3+temp4 … … 180 181 temp4=split_list(separator=';', mylist=temp3) 181 182 if len(temp3+ temp4)==0:# [FIXED]= only one param 182 listtofill= [line.lstrip().rstrip()] 183 if line.lstrip().rstrip()!="": 184 listtofill= [line.lstrip().rstrip()] 183 185 listtofill+=temp3+temp4 # 184 186 break -
sansmodels/src/sans/models/c_models/models.hh
r5068697 r27a0771 266 266 double evaluate_rphi(double q, double phi); 267 267 }; 268 269 268 class TriaxialEllipsoidModel{ 270 269 public: … … 333 332 double evaluate_rphi(double q, double phi); 334 333 }; 334 335 class LamellarPSModel{ 336 public: 337 // Model parameters 338 Parameter scale; 339 Parameter spacing; 340 Parameter delta; 341 Parameter sigma; 342 Parameter contrast; 343 Parameter n_plates; 344 Parameter caille; 345 Parameter background; 346 347 // Constructor 348 LamellarPSModel(); 349 350 // Operators to get I(Q) 351 double operator()(double q); 352 double operator()(double qx, double qy); 353 double evaluate_rphi(double q, double phi); 354 }; 355 356 class LamellarPSHGModel{ 357 public: 358 // Model parameters 359 Parameter scale; 360 Parameter spacing; 361 Parameter deltaT; 362 Parameter deltaH; 363 Parameter sld_tail; 364 Parameter sld_head; 365 Parameter sld_solvent; 366 Parameter n_plates; 367 Parameter caille; 368 Parameter background; 369 370 // Constructor 371 LamellarPSHGModel(); 372 373 // Operators to get I(Q) 374 double operator()(double q); 375 double operator()(double qx, double qy); 376 double evaluate_rphi(double q, double phi); 377 }; 378 379 class OblateModel{ 380 public: 381 // Model parameters 382 Parameter scale; 383 Parameter major_core; 384 Parameter minor_core; 385 Parameter major_shell; 386 Parameter minor_shell; 387 Parameter contrast; 388 Parameter sld_solvent; 389 Parameter background; 390 Parameter axis_theta; 391 Parameter axis_phi; 392 393 // Constructor 394 OblateModel(); 395 396 // Operators to get I(Q) 397 double operator()(double q); 398 double operator()(double qx, double qy); 399 double evaluate_rphi(double q, double phi); 400 }; 401 class ProlateModel{ 402 public: 403 // Model parameters 404 Parameter scale; 405 Parameter major_core; 406 Parameter minor_core; 407 Parameter major_shell; 408 Parameter minor_shell; 409 Parameter contrast; 410 Parameter sld_solvent; 411 Parameter background; 412 Parameter axis_theta; 413 Parameter axis_phi; 414 415 // Constructor 416 ProlateModel(); 417 418 // Operators to get I(Q) 419 double operator()(double q); 420 double operator()(double qx, double qy); 421 double evaluate_rphi(double q, double phi); 422 }; 423 335 424 #endif
Note: See TracChangeset
for help on using the changeset viewer.