Changeset 5068697 in sasview
- Timestamp:
- Jun 26, 2009 5:49:03 PM (16 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:
- 27a0771
- Parents:
- f41b4c3
- Location:
- sansmodels/src
- Files:
-
- 18 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/ParallelepipedModel.py
r8a48713 r5068697 74 74 75 75 ## fittable parameters 76 self.fixed=['short_edgeA.width', 'longer_edgeB.width', 'longuest_edgeC.width' ]76 self.fixed=['short_edgeA.width', 'longer_edgeB.width', 'longuest_edgeC.width', 'parallel_phi.width', 'parallel_theta.width'] 77 77 78 78 ## parameters with orientation -
sansmodels/src/sans/models/c_extensions/c_models.c
r8a48713 r5068697 39 39 addCDiamCylFunc(m); 40 40 addCEllipticalCylinderModel(m); 41 addCTriaxialEllipsoidModel(m); 42 addCFlexibleCylinderModel(m); 43 addCStackedDisksModel(m); 41 44 addDisperser(m); 42 45 addCGaussian(m); -
sansmodels/src/sans/models/c_extensions/parallelepiped.c
r8a48713 r5068697 13 13 /** 14 14 * Function to evaluate 1D scattering function 15 * @param pars: parameters of the cylinder15 * @param pars: parameters of the parallelepiped 16 16 * @param q: q-value 17 17 * @return: function value … … 33 33 /** 34 34 * Function to evaluate 2D scattering function 35 * @param pars: parameters of the cylinder35 * @param pars: parameters of the parallelepiped 36 36 * @param q: q-value 37 37 * @return: function value -
sansmodels/src/sans/models/c_extensions/parallelepiped.h
r8a48713 r5068697 17 17 background:Incoherent Background [1/cm] 18 18 </text> 19 [FIXED]= <text>short_edgeA.width; longer_edgeB.width; longuest_edgeC.width </text>19 [FIXED]= <text>short_edgeA.width; longer_edgeB.width; longuest_edgeC.width;parallel_phi.width; parallel_theta.width</text> 20 20 [ORIENTATION_PARAMS]= <text>parallel_phi; parallel_theta; parallel_phi.width; parallel_theta.width</text> 21 21 -
sansmodels/src/sans/models/c_models/c_models.cpp
r8a48713 r5068697 21 21 void addCEllipsoidModel(PyObject *module); 22 22 void addCEllipticalCylinderModel(PyObject *module); 23 void addCTriaxialEllipsoidModel(PyObject *module); 24 void addCFlexibleCylinderModel(PyObject *module); 25 void addCStackedDisksModel(PyObject *module); 23 26 24 27 extern "C" { … … 161 164 addCDiamCylFunc(m); 162 165 addCEllipticalCylinderModel(m); 166 addCTriaxialEllipsoidModel(m); 167 addCFlexibleCylinderModel(m); 168 addCStackedDisksModel(m); 163 169 addDisperser(m); 164 170 addCGaussian(m); -
sansmodels/src/sans/models/c_models/models.hh
r8a48713 r5068697 267 267 }; 268 268 269 class TriaxialEllipsoidModel{ 270 public: 271 // Model parameters 272 Parameter scale; 273 Parameter semi_axisA; 274 Parameter semi_axisB; 275 Parameter semi_axisC; 276 Parameter contrast; 277 Parameter background; 278 Parameter axis_theta; 279 Parameter axis_phi; 280 281 // Constructor 282 TriaxialEllipsoidModel(); 283 284 // Operators to get I(Q) 285 double operator()(double q); 286 double operator()(double qx, double qy); 287 double evaluate_rphi(double q, double phi); 288 }; 289 290 class FlexibleCylinderModel{ 291 public: 292 // Model parameters 293 Parameter scale; 294 Parameter length; 295 Parameter kuhn_length; 296 Parameter radius; 297 Parameter contrast; 298 Parameter background; 299 Parameter axis_theta; 300 Parameter axis_phi; 301 302 // Constructor 303 FlexibleCylinderModel(); 304 305 // Operators to get I(Q) 306 double operator()(double q); 307 double operator()(double qx, double qy); 308 double evaluate_rphi(double q, double phi); 309 }; 310 311 class StackedDisksModel{ 312 public: 313 // Model parameters 314 Parameter scale; 315 Parameter length; 316 Parameter radius; 317 Parameter thickness; 318 Parameter core_sld; 319 Parameter layer_sld; 320 Parameter solvent_sld; 321 Parameter nlayers; 322 Parameter spacing; 323 Parameter background; 324 Parameter axis_theta; 325 Parameter axis_phi; 326 327 // Constructor 328 StackedDisksModel(); 329 330 // Operators to get I(Q) 331 double operator()(double q); 332 double operator()(double qx, double qy); 333 double evaluate_rphi(double q, double phi); 334 }; 269 335 #endif -
sansmodels/src/setup.py
rf41b4c3 r5068697 11 11 """ 12 12 import sys 13 13 14 14 15 … … 145 146 "sans/models/c_models/ellipticalcylinder.cpp", 146 147 srcdir+"/elliptical_cylinder.c", 148 #srcdir+"/CTriaxialEllipsoidModel.c", 149 "sans/models/c_models/CTriaxialEllipsoidModel.cpp", 150 "sans/models/c_models/triaxialellipsoid.cpp", 151 srcdir+"/triaxial_ellipsoid.c", 152 #srcdir+"/CFlexibleCylinderModel.c", 153 "sans/models/c_models/CFlexibleCylinderModel.cpp", 154 "sans/models/c_models/flexiblecylinder.cpp", 155 srcdir+"/flexible_cylinder.c", 156 #srcdir+"/CStakedDisksModel.c", 157 "sans/models/c_models/CStackedDisksModel.cpp", 158 "sans/models/c_models/stackeddisks.cpp", 159 srcdir+"/stacked_disks.c", 147 160 srcdir+"/disperser.c", 148 161 igordir+"/libCylinder.c",
Note: See TracChangeset
for help on using the changeset viewer.