Changeset 6cf1cb3 in sasmodels for sasmodels/models/hollow_cylinder.c

Timestamp:

Nov 17, 2015 2:57:11 PM (8 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

File:

• sasmodels/models/hollow_cylinder.c (modified) (4 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);