Changeset 6cf1cb3 in sasmodels
 Timestamp:
 Nov 17, 2015 4:57:11 PM (9 years ago)
 Branches:
 master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket1257vesicleproduct, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
 Children:
 48be770
 Parents:
 143d596
 Location:
 sasmodels/models
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/models/hollow_cylinder.c
r84e6942 r6cf1cb3 4 4 double form_volume(double radius, double core_radius, double length); 5 5 double Iq(double q, double radius, double core_radius, double length, double sld, 6 double solvent_sld , double axis_theta, double axis_phi);6 double solvent_sld); 7 7 double Iqxy(double qx, double qy, double radius, double core_radius, double length, double sld, 8 double solvent_sld, double axis_theta, double axis_phi);8 double solvent_sld, double theta, double phi); 9 9 10 10 // From Igor library … … 48 48 } 49 49 50 //FIXME: Returning values 10^12 times too high51 50 double Iq(double q, double radius, double core_radius, double length, double sld, 52 double solvent_sld , double axis_theta, double axis_phi)51 double solvent_sld) 53 52 { 54 53 int i; … … 74 73 //normalize by volume 75 74 volume = form_volume(radius, core_radius, length); 76 //convert to [cm1] 77 convert = 1.0e 8;78 answer = norm*scale* volume*convert;75 //convert to [cm1] given sld*1e6 76 convert = 1.0e4; 77 answer = norm*scale*convert*volume*volume; 79 78 80 79 return(answer); … … 83 82 //TODO: Add this in 84 83 double Iqxy(double qx, double qy, double radius, double core_radius, double length, double sld, 85 double solvent_sld, double axis_theta, double axis_phi)84 double solvent_sld, double theta, double phi) 86 85 { 87 86 return(0.0); 
sasmodels/models/hollow_cylinder.py
r84e6942 r6cf1cb3 78 78 # ["name", "units", default, [lower, upper], "type","description"], 79 79 parameters = [ 80 ["radius", "Ang", 30.0, [0, inf], " ", "Cylinder radius"],81 ["core_radius", "Ang", 20.0, [0, inf], " ", "Hollow core radius"],82 ["length", "Ang", 400.0, [0, inf], " ", "Cylinder length"],80 ["radius", "Ang", 30.0, [0, inf], "volume", "Cylinder radius"], 81 ["core_radius", "Ang", 20.0, [0, inf], "volume", "Hollow core radius"], 82 ["length", "Ang", 400.0, [0, inf], "volume", "Cylinder length"], 83 83 ["sld", "1/Ang^2", 6.3, [inf, inf], "", "Cylinder sld"], 84 84 ["solvent_sld", "1/Ang^2", 1, [inf, inf], "", "Solvent sld"], 85 [" axis_theta", "[deg]", 90, [360, 360], "", "Theta angle"],86 [" axis_phi", "[deg]", 0, [360, 360], "", "Phi angle"],85 ["theta", "[deg]", 90, [360, 360], "orientation", "Theta angle"], 86 ["phi", "[deg]", 0, [360, 360], "orientation", "Phi angle"], 87 87 ] 88 88 … … 91 91 # parameters for demo 92 92 demo = dict(scale=1.0,background=0.0,length=400.0,radius=30.0,core_radius=20.0, 93 sld=6.3,solvent_sld=1,axis_theta=90,axis_phi=0) 93 sld=6.3,solvent_sld=1,theta=90,phi=0, 94 radius_pd=.2, radius_pd_n=9, 95 length_pd=.2, length_pd_n=10, 96 theta_pd=10, theta_pd_n=5, 97 ) 94 98 95 99 # For testing against the old sasview models, include the converted parameter … … 98 102 oldpars = dict(scale='scale',background='background',radius='radius', 99 103 core_radius='core_radius',sld='sldCyl',length='length', 100 solvent_sld='sldSolv', axis_phi='axis_phi',axis_theta='axis_theta')104 solvent_sld='sldSolv',phi='axis_phi',theta='axis_theta')
Note: See TracChangeset
for help on using the changeset viewer.