Changeset 6cf1cb3 in sasmodels

Timestamp:

Nov 17, 2015 4:57:11 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

48be770

Parents:

143d596

Message:

hollow cylinder: scale SLD by 1e-6, mark volume and orientation parameters, scale by volume

Location:

sasmodels/models

Files:

• hollow_cylinder.c (modified) (4 diffs)
• hollow_cylinder.py (modified) (3 diffs)

sasmodels/models/hollow_cylinder.c

@@ -4 +4 @@
 double form_volume(double radius, double core_radius, double length);
 double Iq(double q, double radius, double core_radius, double length, double sld,
-        double solvent_sld, double axis_theta, double axis_phi);
+        double solvent_sld);
 double Iqxy(double qx, double qy, double radius, double core_radius, double length, double sld,
-        double solvent_sld, double axis_theta, double axis_phi);
+        double solvent_sld, double theta, double phi);
 
 // From Igor library
@@ -48 +48 @@
 }
 
-//FIXME: Returning values 10^12 times too high
 double Iq(double q, double radius, double core_radius, double length, double sld,
-        double solvent_sld, double axis_theta, double axis_phi)
+        double solvent_sld)
 {
     int i;
@@ -74 +73 @@
         //normalize by volume
         volume = form_volume(radius, core_radius, length);
-        //convert to [cm-1]
-        convert = 1.0e8;
-        answer = norm*scale*volume*convert;
+        //convert to [cm-1] given sld*1e6
+        convert = 1.0e-4;
+        answer = norm*scale*convert*volume*volume;
         
         return(answer);
@@ -83 +82 @@
 //TODO: Add this in
 double Iqxy(double qx, double qy, double radius, double core_radius, double length, double sld,
-        double solvent_sld, double axis_theta, double axis_phi)
+        double solvent_sld, double theta, double phi)
 {
     return(0.0);

sasmodels/models/hollow_cylinder.py

@@ -78 +78 @@
 #             ["name", "units", default, [lower, upper], "type","description"],
 parameters = [
-              ["radius", "Ang", 30.0, [0, inf], "", "Cylinder radius"],
-              ["core_radius", "Ang", 20.0, [0, inf], "", "Hollow core radius"],
-              ["length", "Ang", 400.0, [0, inf], "", "Cylinder length"],
+              ["radius", "Ang", 30.0, [0, inf], "volume", "Cylinder radius"],
+              ["core_radius", "Ang", 20.0, [0, inf], "volume", "Hollow core radius"],
+              ["length", "Ang", 400.0, [0, inf], "volume", "Cylinder length"],
               ["sld", "1/Ang^2", 6.3, [-inf, inf], "", "Cylinder sld"],
               ["solvent_sld", "1/Ang^2", 1, [-inf, inf], "", "Solvent sld"],
-              ["axis_theta", "[deg]", 90, [-360, 360], "", "Theta angle"],
-              ["axis_phi", "[deg]", 0, [-360, 360], "", "Phi angle"],
+              ["theta", "[deg]", 90, [-360, 360], "orientation", "Theta angle"],
+              ["phi", "[deg]", 0, [-360, 360], "orientation", "Phi angle"],
               ]
 
@@ -91 +91 @@
 # parameters for demo
 demo = dict(scale=1.0,background=0.0,length=400.0,radius=30.0,core_radius=20.0,
-            sld=6.3,solvent_sld=1,axis_theta=90,axis_phi=0)
+            sld=6.3,solvent_sld=1,theta=90,phi=0,
+            radius_pd=.2, radius_pd_n=9,
+            length_pd=.2, length_pd_n=10,
+            theta_pd=10, theta_pd_n=5,
+            )
 
 # For testing against the old sasview models, include the converted parameter
@@ -98 +102 @@
 oldpars = dict(scale='scale',background='background',radius='radius',
                core_radius='core_radius',sld='sldCyl',length='length',
-               solvent_sld='sldSolv',axis_phi='axis_phi',axis_theta='axis_theta')
+               solvent_sld='sldSolv',phi='axis_phi',theta='axis_theta')