Changeset 4d3acb6 in sasview for sansmodels
- Timestamp:
- Oct 27, 2008 1:38:21 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:
- d611fb93
- Parents:
- 96672c0
- Location:
- sansmodels/src/sans/models/c_extensions
- Files:
-
- 4 edited
-
WrapperGenerator.py (modified) (2 diffs)
-
core_shell_cylinder.h (modified) (1 diff)
-
cylinder.h (modified) (1 diff)
-
ellipsoid.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_extensions/WrapperGenerator.py
r96672c0 r4d3acb6 147 147 break 148 148 else: 149 print re.search("//",line) 149 if re.search("*",line)!=None: 150 temp=line.split("//",1) 151 self.description+='\n'+temp[1].lstrip().rstrip() 150 152 if re.search("//",line)!=None: 151 153 temp=line.split("//",1) … … 153 155 154 156 else: 155 self.description+= line157 self.description+='\n'+line.lstrip().rstrip() 156 158 157 159 -
sansmodels/src/sans/models/c_extensions/core_shell_cylinder.h
r96672c0 r4d3acb6 7 7 //[PYTHONCLASS] = CoreShellCylinderModel 8 8 //[DISP_PARAMS] = radius, thickness, length, axis_theta, axis_phi 9 //[DESCRIPTION] = <text> "P(q,alpha)= scale/Vs*f(q)^(2) + bkg Where:\n\10 f(q)= 2(core_sld- solvant_sld)* Vc*sin[qLcos(alpha/2)]/\n\11 [qLcos(alpha/2)]*J1(qRsin(alpha))/[qRsin(alpha)] +\n 2(shell_sld-solvent_sld)*Vs\n\ 12 *sin[q(L+T)cos(alpha/2)]/[[q(L+T)cos(alpha/2)]\n\ 13 *J1(q(R+T)sin(alpha))/q(R+T)sin(alpha)]\n\ 14 alpha:is the angle between the axis of the cylinder and the q-vector\n\ 15 Vs: the volume of the outer shell\n\ 16 Vc: the volume of the core\n\17 L: the length of the core\n\18 shell_sld: the scattering length density of the shell\n\19 solvent_sld: the scattering length density of the solvent\n\ 20 bkg: the background\n\21 T: the thickness\n\22 R+T: is the outer radius\n\23 L+2T: The total length of the outershell\n\24 J1: the first order Bessel function\n\ 25 theta: axis_theta of the cylinder\n\26 phi: the axis_phi of the cylinder"\27 </text>9 //[DESCRIPTION] = <text>P(q,alpha)= scale/Vs*f(q)^(2) + bkg Where:\n\ 10 // f(q)= 2(core_sld- solvant_sld)* Vc*sin[qLcos(alpha/2)]/\n\ 11 // [qLcos(alpha/2)]*J1(qRsin(alpha))/[qRsin(alpha)] +\n 2(shell_sld-solvent_sld)*Vs 12 // *sin[q(L+T)cos(alpha/2)]/[[q(L+T)cos(alpha/2)] 13 // *J1(q(R+T)sin(alpha))/q(R+T)sin(alpha)] 14 // alpha:is the angle between the axis of the cylinder and the q-vector 15 // Vs: the volume of the outer shell 16 // Vc: the volume of the core 17 // L: the length of the core 18 // shell_sld: the scattering length density of the shell 19 // solvent_sld: the scattering length density of the solvent 20 // bkg: the background 21 // T: the thickness 22 // R+T: is the outer radius 23 // L+2T: The total length of the outershell 24 // J1: the first order Bessel function 25 // theta: axis_theta of the cylinder 26 // phi: the axis_phi of the cylinder 27 // </text> 28 28 29 29 typedef struct { -
sansmodels/src/sans/models/c_extensions/cylinder.h
r96672c0 r4d3acb6 5 5 * [PYTHONCLASS] = CylinderModel 6 6 * [DISP_PARAMS] = radius, length, cyl_theta, cyl_phi 7 [DESCRIPTION] = <text> "P(q,alpha)= scale/V*f(q)^(2)+bkg\n\8 f(q)= 2*(scatter_sld - solvent_sld)*V*sin(qLcos(alpha/2))/[qLcos(alpha/2)]* \n\9 J1(qRsin(alpha/2))/[qRsin(alpha)] \n\10 V: Volume of the cylinder \n\11 R: Radius of the cylinder \n\12 L: Length of the cylinder \n\13 J1: The bessel function \n\14 alpha: angle betweenthe axis of the cylinder and the q-vector \n\15 for 1D:the ouput is P(q)=scale/V*integral from pi/2 to zero of f(q)^(2)* \n\16 sin(alpha)*dalpha+ bkg "7 [DESCRIPTION] = <text>P(q,alpha)= scale/V*f(q)^(2)+bkg 8 f(q)= 2*(scatter_sld - solvent_sld)*V*sin(qLcos(alpha/2))/[qLcos(alpha/2)]* 9 J1(qRsin(alpha/2))/[qRsin(alpha)] 10 V: Volume of the cylinder 11 R: Radius of the cylinder 12 L: Length of the cylinder 13 J1: The bessel function 14 alpha: angle betweenthe axis of the cylinder and the q-vector 15 for 1D:the ouput is P(q)=scale/V*integral from pi/2 to zero of f(q)^(2)* 16 sin(alpha)*dalpha+ bkg 17 17 </text> 18 18 -
sansmodels/src/sans/models/c_extensions/ellipsoid.h
r96672c0 r4d3acb6 10 10 //[DISP_PARAMS] = radius_a, radius_b, axis_theta, axis_phi 11 11 //[DESCRIPTION] = <text>"P(q.alpha)= scale*f(q)^(2)+ bkg\n\ 12 f(q)= 3*(scatter_sld- scatter_solvent)*V*[sin(q*r(Ra,Rb,alpha)) - q*r*cos(qr(Ra,Rb,alpha))]\n\ 13 /[qr(Ra,Rb,alpha)]^(3)"\ 14 r(Ra,Rb,alpha)= [Rb^(2)*(sin(alpha))^(2) + Ra^(2)*(cos(alpha))^(2)]^(1/2)\ 15 scatter_sld: scattering length density of the scatter\n\ 16 solvent_sld: scattering length density of the solvent\n\ 17 V: volune of the Eliipsoid\n\ 18 Ra: radius along the rotation axis of the Ellipsoid\n\ 19 Rb: radius perpendicular to the rotation axis of the ellipsoid\n\ 20 </text>12 // f(q)= 3*(scatter_sld- scatter_solvent)*V*[sin(q*r(Ra,Rb,alpha)) - q*r*cos(qr(Ra,Rb,alpha))] 13 // /[qr(Ra,Rb,alpha)]^(3)" 14 // r(Ra,Rb,alpha)= [Rb^(2)*(sin(alpha))^(2) + Ra^(2)*(cos(alpha))^(2)]^(1/2) 15 // scatter_sld: scattering length density of the scatter 16 // solvent_sld: scattering length density of the solvent 17 // V: volune of the Eliipsoid 18 // Ra: radius along the rotation axis of the Ellipsoid 19 // Rb: radius perpendicular to the rotation axis of the ellipsoid 20 // </text> 21 21 typedef struct { 22 22 /// Scale factor
Note: See TracChangeset
for help on using the changeset viewer.
