Changeset 543d1bd in sasview
- Timestamp:
- Feb 27, 2012 6:27:47 PM (12 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:
- 996c643
- Parents:
- 015eb2b
- Files:
-
- 3 added
- 5 edited
-
fittingview/src/sans/perspectives/fitting/models.py (modified) (1 diff)
-
sansmodels/include/core_shell_bicelle.h (added)
-
sansmodels/src/c_models/c_models.cpp (modified) (2 diffs)
-
sansmodels/src/c_models/coreshellbicelle.cpp (added)
-
sansmodels/src/sans/models/media/cscylbicelle_pic.jpg (added)
-
sansmodels/src/sans/models/media/model_functions.html (modified) (25 diffs)
-
sansmodels/test/utest_other_models.py (modified) (2 diffs)
-
sansview/media/Model Functions.pdf (modified) (previous)
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/models.py
r51da9dc r543d1bd 341 341 self.model_name_list.append(CoreShellCylinderModel.__name__) 342 342 343 from sans.models.CoreShellBicelleModel import CoreShellBicelleModel 344 self.shape_list.append(CoreShellBicelleModel) 345 self.multiplication_factor.append(CoreShellBicelleModel) 346 self.model_name_list.append(CoreShellBicelleModel.__name__) 347 343 348 from sans.models.HollowCylinderModel import HollowCylinderModel 344 349 self.shape_list.append(HollowCylinderModel) -
sansmodels/src/c_models/c_models.cpp
r08648c0 r543d1bd 36 36 void addCCoreFourShellModel(PyObject *module); 37 37 void addCCoreShellCylinderModel(PyObject *module); 38 void addCCoreShellBicelleModel(PyObject *module); 38 39 void addCEllipsoidModel(PyObject *module); 39 40 void addCEllipticalCylinderModel(PyObject *module); … … 254 255 addCCSParallelepipedModel(m); 255 256 addCCoreShellCylinderModel(m); 257 addCCoreShellBicelleModel(m); 256 258 addCCoreShellModel(m); 257 259 addCCoreFourShellModel(m); -
sansmodels/src/sans/models/media/model_functions.html
r6752950 r543d1bd 456 456 </li> 457 457 <li class="MsoNormal" style="line-height: 115%;"><a href="#Shapes"><b>Shapes</b></a>: <a href="#SphereModel">SphereModel</a>, <a href="#BinaryHSModel">BinaryHSModel</a>, <a href="#FuzzySphereModel">FuzzySphereModel</a>, <a href="#CoreShellModel">CoreShellModel</a>, <a href="#Core2ndMomentModel">Core2ndMomentModel</a>, <a href="#CoreMultiShellModel">CoreMultiShellModel</a>, <a href="#VesicleModel">VesicleModel</a>, <a href="#MultiShellModel">MultiShellModel</a>, <a href="#OnionExpShellModel">OnionExpShellModel</a>, <a href="#SphericalSLDModel">SphericalSLDModel</a>, <a href="#LinearPearlsModel">LinearPearlsModel</a>, <a href="#PearlNecklaceModel">PearlNecklaceModel</a> , <a href="#CylinderModel">CylinderModel</a>, <a href="#CoreShellCylinderModel">CoreShellCylinderModel</a>, 458 <a href="# HollowCylinderModel">HollowCylinderModel</a>,458 <a href="#CoreShellBicelleModel">CoreShellBicelleModel</a>,<a href="#HollowCylinderModel">HollowCylinderModel</a>, 459 459 <a href="#FlexibleCylinderModel">FlexibleCylinderModel</a>, 460 460 <a href="#FlexibleCylinderModel">FlexCylEllipXModel</a>, … … 3340 3340 <p class="MsoNormal"> </p> 3341 3341 <p class="MsoNormal"> </p> 3342 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.15.</span></b><b><span style="font-size: 7pt;"> 3343 </span></b><a name="CoreShellBicelleModel"><b><span style="font-size: 14pt;">Core-Shell (Cylinder) Bicelle Model</span></b></a></p> 3344 <p class="MsoNormal"> </p> 3345 <p class="MsoNormal">This model provides the form factor 3346 for a circular cylinder 3347 with a core-shell scattering length density profile. The form factor is 3348 normalized by the particle volume. This model is a more general case of 3349 <a href="#CoreShellCylinderModel"> 3350 core-shell cylinder model </a> (see above and reference below) in 3351 that the parameters of the shell are separated into a face-shell and 3352 a rim-shell so that users can set different values of the thicknesses 3353 and slds. </p> 3354 <p class="MsoNormal"></p> 3355 <p class="MsoNormal">The returned value is scaled to units 3356 of [cm<sup>-1</sup>] 3357 and the parameters of the core-shell cylinder model are the following:</p> 3358 <p class="MsoNormal"> </p> 3359 <div align="center"> 3360 <table class="MsoNormalTable" style="border-collapse: collapse;" border="2" cellpadding="0" cellspacing="0"> 3361 <tbody> 3362 <tr style="height: 19.25pt;"> 3363 <td style="border: 1pt solid windowtext; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3364 <p class="MsoBodyText">Parameter name</p> 3365 </td> 3366 <td style="border-style: solid solid solid none; border-color: windowtext windowtext windowtext -moz-use-text-color; border-width: 1pt 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3367 <p class="MsoBodyText">Units</p> 3368 </td> 3369 <td style="border-style: solid solid solid none; border-color: windowtext windowtext windowtext -moz-use-text-color; border-width: 1pt 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3370 <p class="MsoBodyText">Default value</p> 3371 </td> 3372 </tr> 3373 <tr style="height: 19.25pt;"> 3374 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3375 <p class="MsoBodyText">scale</p> 3376 </td> 3377 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3378 <p class="MsoBodyText">None</p> 3379 </td> 3380 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3381 <p class="MsoBodyText">1.0</p> 3382 </td> 3383 </tr> 3384 <tr style="height: 19.25pt;"> 3385 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3386 <p class="MsoBodyText">radius</p> 3387 </td> 3388 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3389 <p class="MsoBodyText">Å</p> 3390 </td> 3391 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3392 <p class="MsoBodyText">20.0</p> 3393 </td> 3394 </tr> 3395 <tr style="height: 19.25pt;"> 3396 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3397 <p class="MsoBodyText">rim_thick</p> 3398 </td> 3399 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3400 <p class="MsoBodyText">Å</p> 3401 </td> 3402 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3403 <p class="MsoBodyText">10.0</p> 3404 </td> 3405 </tr> 3406 <tr> 3407 <td>face_thick</td> 3408 <td>Å</td> 3409 <td>10.0</td> 3410 </tr> 3411 <tr style="height: 19.25pt;"> 3412 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3413 <p class="MsoBodyText">length</p> 3414 </td> 3415 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3416 <p class="MsoBodyText">Å</p> 3417 </td> 3418 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3419 <p class="MsoBodyText">400.0</p> 3420 </td> 3421 </tr> 3422 <tr style="height: 19.25pt;"> 3423 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; vertical-align: top; width: 107pt; height: 19.25pt;"> 3424 <p class="MsoBodyText">core_sld</p> 3425 </td> 3426 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3427 <p class="MsoBodyText">Å<sup> -2</sup></p> 3428 </td> 3429 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3430 <p class="MsoBodyText">1e-6</p> 3431 </td> 3432 </tr> 3433 <tr style="height: 19.25pt;"> 3434 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3435 <p class="MsoBodyText">rim_sld</p> 3436 </td> 3437 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3438 <p class="MsoBodyText">Å<sup> -2</sup></p> 3439 </td> 3440 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3441 <p class="MsoBodyText">4e-6</p> 3442 </td> 3443 </tr> 3444 <tr> 3445 <td>face_sld</td> 3446 <td>Å<sup> -2</sup></td> 3447 <td>4e-6</td> 3448 </tr> 3449 <tr style="height: 19.25pt;"> 3450 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3451 <p class="MsoBodyText">solvent_sld</p> 3452 </td> 3453 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3454 <p class="MsoBodyText">Å<sup> -2</sup></p> 3455 </td> 3456 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3457 <p class="MsoBodyText">1e-6</p> 3458 </td> 3459 </tr> 3460 <tr style="height: 19.25pt;"> 3461 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3462 <p class="MsoBodyText">background</p> 3463 </td> 3464 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3465 <p class="MsoBodyText">cm<sup>-1</sup></p> 3466 </td> 3467 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3468 <p class="MsoBodyText">0.0</p> 3469 </td> 3470 </tr> 3471 <tr style="height: 19.25pt;"> 3472 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3473 <p class="MsoBodyText">axis_theta</p> 3474 </td> 3475 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3476 <p class="MsoBodyText">degree</p> 3477 </td> 3478 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 3479 <p class="MsoBodyText">90</p> 3480 </td> 3481 </tr> 3482 <tr style="height: 20pt;"> 3483 <td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 20pt;" valign="top" width="143"> 3484 <p class="MsoBodyText">axis_phi</p> 3485 </td> 3486 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 20pt;" valign="top" width="143"> 3487 <p class="MsoBodyText">degree</p> 3488 </td> 3489 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 20pt;" valign="top" width="143"> 3490 <p class="MsoBodyText">0.0</p> 3491 </td> 3492 </tr> 3493 </tbody> 3494 </table> 3495 </div> 3496 <p class="MsoNormal"> </p> 3497 <p class="MsoNormal">The output of the 1D scattering 3498 intensity function for 3499 randomly oriented cylinders is then given by the equation above.</p> 3500 <p class="MsoNormal"> </p> 3501 <p class="MsoNormal">The <i>axis_theta</i> 3502 and axis<i>_phi</i> parameters are not 3503 used for the 1D output. Our implementation of the scattering kernel and 3504 the 1D 3505 scattering intensity use the c-library from NIST.</p> 3506 <p class="MsoNormal"></p> 3507 <p class="MsoNormal"> </p> 3508 <p class="MsoNormal"> </p> 3509 <p class="MsoNormal" style="text-align: center;" align="center"><img style="width: 512px; height: 377px;" id="cscylbicelle" src="cscylbicelle_pic.jpg"></p> 3510 <p class="MsoNormal" style="text-align: center;" align="center"><b>Figure. 3511 1D plot using the default values (w/200 data point).</b></p> 3512 <p class="MsoNormal" style="text-align: center;" align="center"> </p> 3513 <p class="MsoNormal" style="text-align: center;" align="center"> </p> 3514 <p class="MsoNormal"> REFERENCE<br> 3515 Feigin, L. A, and D. I. Svergun, "Structure Analysis by Small-Angle 3516 X-Ray and Neutron Scattering", Plenum Press, New York, (1987).</p> 3342 3517 <p class="MsoNormal"><b> </b></p> 3343 3518 <p class="MsoNormal"><b> </b></p> 3344 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.1 5.</span></b><b><span style="font-size: 7pt;"> 3519 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.16.</span></b><b><span style="font-size: 7pt;"> 3345 3520 </span></b><a name="HollowCylinderModel"><b><span style="font-size: 14pt;">HollowCylinderModel</span></b></a></p> 3346 3521 <p class="MsoNormal"> </p> … … 3509 3684 <p class="MsoNormal"><b> </b></p> 3510 3685 <p class="MsoNormal"><b> </b></p> 3511 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.1 6.</span></b><b><span style="font-size: 7pt;"> 3686 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.17.</span></b><b><span style="font-size: 7pt;"> 3512 3687 </span></b><a name="FlexibleCylinderModel"></a><b><span style="font-size: 14pt;">FlexibleCylinderModel</span></b></p> 3513 3688 <p class="MsoNormal"> </p> … … 3672 3847 <p class="MsoNormal"> </p> 3673 3848 <p class="MsoNormal"> </p> 3674 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.1 7.</span></b><b><span style="font-size: 7pt;"> 3849 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.18.</span></b><b><span style="font-size: 7pt;"> 3675 3850 </span></b><b><span style="font-size: 14pt;">FlexCylEllipXMo<a name="FlexCylEllipXModel"></a>del</span></b></p> 3676 3851 <p class="MsoNormal"> </p> … … 3899 4074 <p class="MsoNormal"> </p> 3900 4075 <p class="MsoNormal"><b> </b></p> 3901 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.1 8.</span></b><b><span style="font-size: 7pt;"> 4076 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.19.</span></b><b><span style="font-size: 7pt;"> 3902 4077 </span></b><a name="StackedDisksModel"><b><span style="font-size: 14pt;">StackedDisksModel 3903 4078 </span></b></a></p> … … 4143 4318 <p class="MsoNormal"><b> </b></p> 4144 4319 <p class="MsoNormal"><b> </b></p> 4145 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2. 19.</span></b><b><span style="font-size: 7pt;"> 4320 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.20.</span></b><b><span style="font-size: 7pt;"> 4146 4321 </span></b><a name="ParallelepipedModel"><b><span style="font-size: 14pt;">ParallelepipedModel</span></b></a></p> 4147 4322 <p class="MsoNormal"> </p> … … 4338 4513 <p class="MsoNormal"><b> </b></p> 4339 4514 <p class="MsoNormal"><b> </b></p> 4340 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 0.</span></b><b><span style="font-size: 7pt;"> 4515 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.21.</span></b><b><span style="font-size: 7pt;"> 4341 4516 </span></b><b><span style="font-size: 14pt;"><a name="CSParallelepipedModel">CSParallelepipedModel</a></span></b></p> 4342 4517 <p class="MsoNormal"> </p> … … 4647 4822 <p class="MsoNormal"> </p> 4648 4823 <p class="MsoNormal"> </p> 4649 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 1.</span></b><b><span style="font-size: 7pt;"> 4824 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.22.</span></b><b><span style="font-size: 7pt;"> 4650 4825 </span></b><a name="EllipticalCylinderModel"><b><span style="font-size: 14pt;">Elliptical 4651 4826 Cylinder Model</span></b></a></p> … … 4881 5056 <p class="MsoNormal"> </p> 4882 5057 <p class="MsoNormal"> </p> 4883 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 2.</span></b><b><span style="font-size: 7pt;"> 5058 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.23.</span></b><b><span style="font-size: 7pt;"> 4884 5059 </span></b><a name="BarBellModel"><b><span style="font-size: 14pt;">BarBell(/DumBell)Model</span></b></a></p> 4885 5060 <p class="MsoNormal"> </p> … … 5089 5264 <p class="MsoNormal"> </p> 5090 5265 <p class="MsoNormal"> </p> 5091 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 3.</span></b><b><span style="font-size: 7pt;"> 5266 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.24.</span></b><b><span style="font-size: 7pt;"> 5092 5267 </span></b><a name="CappedCylinderModel"><b><span style="font-size: 14pt;">CappedCylinder(/ConvexLens)Model</span></b></a></p> 5093 5268 <p class="MsoNormal"> </p> … … 5292 5467 <p class="MsoNormal"> </p> 5293 5468 <p class="MsoNormal"> </p> 5294 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 4.</span></b><b><span style="font-size: 7pt;"> 5469 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.25.</span></b><b><span style="font-size: 7pt;"> 5295 5470 </span></b><a name="EllipsoidModel"><b><span style="font-size: 14pt;">Ellipsoid 5296 5471 Model</span></b></a></p> … … 5548 5723 <p class="MsoNormal"><b> </b></p> 5549 5724 <p class="MsoNormal"><b> </b></p> 5550 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 5.</span></b><b><span style="font-size: 7pt;"> 5725 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.26.</span></b><b><span style="font-size: 7pt;"> 5551 5726 </span></b><a name="CoreShellEllipsoidModel"><b><span style="font-size: 14pt;">CoreShellEllipsoidModel 5552 5727 </span></b></a></p> … … 5745 5920 <p class="MsoNormal"><b> </b></p> 5746 5921 <p class="MsoNormal"><b> </b></p> 5747 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 6.</span></b><b><span style="font-size: 7pt;"> 5922 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.27.</span></b><b><span style="font-size: 7pt;"> 5748 5923 </span></b><a name="TriaxialEllipsoidModel"><b><span style="font-size: 14pt;">TriaxialEllipsoidModel</span></b></a></p> 5749 5924 <p class="MsoNormal"> </p> … … 5942 6117 <p class="MsoNormal"><b> </b></p> 5943 6118 <p class="MsoNormal"><b> </b></p> 5944 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 7.</span></b><b><span style="font-size: 7pt;"> 6119 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.28.</span></b><b><span style="font-size: 7pt;"> 5945 6120 </span></b><a name="LamellarModel"><b><span style="font-size: 14pt;">LamellarModel</span></b></a></p> 5946 6121 <p class="MsoNormal"> </p> … … 6066 6241 <p class="MsoNormal"><b> </b></p> 6067 6242 <p class="MsoNormal"><b> </b></p> 6068 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.2 8.</span></b><b><span style="font-size: 7pt;"> 6243 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.29.</span></b><b><span style="font-size: 7pt;"> 6069 6244 </span></b><a name="LamellarFFHGModel"><b><span style="font-size: 14pt;">LamellarFFHGModel</span></b></a></p> 6070 6245 <p class="MsoNormal"> </p> … … 6219 6394 <p class="MsoNormal"><b> </b></p> 6220 6395 <p class="MsoNormal"><b> </b></p> 6221 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2. 29.</span></b><b><span style="font-size: 7pt;"> 6396 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.30.</span></b><b><span style="font-size: 7pt;"> 6222 6397 </span></b><a name="LamellarPSModel"><b><span style="font-size: 14pt;">LamellarPSModel</span></b></a></p> 6223 6398 <p class="MsoNormal"> </p> … … 6385 6560 <p class="MsoNormal"><b> </b></p> 6386 6561 <p class="MsoNormal"><b> </b></p> 6387 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.3 0.</span></b><b><span style="font-size: 7pt;"> 6562 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.31.</span></b><b><span style="font-size: 7pt;"> 6388 6563 </span></b><a name="LamellarPSHGModel"><b><span style="font-size: 14pt;">LamellarPSHGModel</span></b></a></p> 6389 6564 <p class="MsoNormal"> </p> … … 6589 6764 <p class="MsoNormal"><b> </b></p> 6590 6765 <p class="MsoNormal"><b> </b></p> 6591 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.3 1.</span></b><b><span style="font-size: 7pt;"> 6766 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.32.</span></b><b><span style="font-size: 7pt;"> 6592 6767 </span></b><a name="LamellarPCrystalModel"><b><span style="font-size: 14pt;">LamellarPCrystalModel</span></b></a></p> 6593 6768 <p class="MsoNormal"> </p> … … 6762 6937 <p class="MsoNormal"><b> </b></p> 6763 6938 <p class="MsoNormal"><b> </b></p> 6764 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.3 2.</span></b><b><span style="font-size: 7pt;"> 6939 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.33.</span></b><b><span style="font-size: 7pt;"> 6765 6940 </span></b><a name="SCCrystalModel"><b><span style="font-size: 14pt;">SC(Simple 6766 6941 Cubic Para-)CrystalModel</span></b></a></p> … … 6980 7155 <p class="MsoNormal"> </p> 6981 7156 <p class="MsoNormal"><b> </b></p> 6982 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.3 3.</span></b><b><span style="font-size: 7pt;"> 7157 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.34.</span></b><b><span style="font-size: 7pt;"> 6983 7158 </span></b><a name="FCCrystalModel"><b><span style="font-size: 14pt;">FC(Face 6984 7159 Centered Cubic Para-)CrystalModel</span></b></a></p> … … 7204 7379 <p class="MsoNormal"> </p> 7205 7380 <p class="MsoNormal"><b> </b></p> 7206 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.3 4.</span></b><b><span style="font-size: 7pt;"> 7381 <p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.35.</span></b><b><span style="font-size: 7pt;"> 7207 7382 </span></b><a name="BCCrystalModel"><b><span style="font-size: 14pt;">BC(Body 7208 7383 Centered Cubic Para-)CrystalModel</span></b></a></p> … … 8347 8522 </td> 8348 8523 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 8349 <p class="MsoBodyText"><br><sup></sup></p> 8524 <p class="MsoBodyText"><br> 8525 </p> 8350 8526 </td> 8351 8527 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> … … 8395 8571 <p class="MsoNormal" style="margin-left: 0.25in;"> Note: 8396 8572 The surface fractal dimension is valid for 8397 1<surface_dim<3. Also it is valid in a limited q range (see the reference for details).</p> 8573 1<surface_dim<3. Also it is valid in a limited 8574 q range (see the reference for details).</p> 8398 8575 <p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 14pt;"> </span></p> 8399 8576 <div align="center"> … … 8460 8637 </td> 8461 8638 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 8462 <p class="MsoBodyText"><br><sup></sup></p> 8639 <p class="MsoBodyText"><br> 8640 </p> 8463 8641 </td> 8464 8642 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> … … 8574 8752 </td> 8575 8753 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> 8576 <p class="MsoBodyText"><br><sup></sup></p> 8754 <p class="MsoBodyText"><br> 8755 </p> 8577 8756 </td> 8578 8757 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143"> -
sansmodels/test/utest_other_models.py
r9fafa39 r543d1bd 272 272 # self.assert_(numpy.isfinite(self.comp.run(0.0))) 273 273 274 274 275 class TestCoreShellBicelleModel(unittest.TestCase): 276 """ Unit tests for CoreShellBicelle Model""" 277 278 def setUp(self): 279 from sans.models.CoreShellCylinderModel import CoreShellCylinderModel 280 from sans.models.CoreShellBicelleModel import CoreShellBicelleModel 281 self.comp1 = CoreShellCylinderModel() 282 self.comp2 = CoreShellBicelleModel() 283 # Using the default values of CSBiselle is same as CSCylinder 284 285 def testcompare1D(self): 286 """ Test 1D model for a CoreShellBicelle Model""" 287 self.assertAlmostEqual(self.comp1.run(0.01), self.comp2.run(0.01), 8) 288 289 def testcompareEval_2D(self): 290 """ Test 2D model for a CoreShellBicelle with evalDistribution""" 291 self.assertAlmostEquals(self.comp1.runXY([0.4, 0.5]),self.comp2.runXY([0.4, 0.5]),8) 292 self.assertAlmostEquals(self.comp1.runXY([1.3,1.57]),self.comp2.runXY([1.3,1.57]),8) 293 294 275 295 class TestHollowCylinderModel(unittest.TestCase): 276 296 """ Unit tests for HollowCylinder Model""" … … 318 338 """ Test 2D model for a HollowCylinder with evalDistribution""" 319 339 self.assertAlmostEquals(self.comp.runXY([0.4, 0.5]),self.xy_matrix[0],8) 320 self.assertAlmostEquals(self.comp.runXY([1.3,1.57]),self.xy_matrix[1], 340 self.assertAlmostEquals(self.comp.runXY([1.3,1.57]),self.xy_matrix[1],8) 321 341 322 342 # No more singular point
Note: See TracChangeset
for help on using the changeset viewer.
