Changeset 7ed702f in sasmodels

Timestamp:

Jan 20, 2016 5:43:26 AM (9 years ago)

Author:

piotr

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:

5c1d341

Parents:

513efc5

Message:

Converted MassStructureModel?
Fixed some doc and unit test warnings

Location:

sasmodels/models

Files:

• bcc.c (modified) (2 diffs)
• hardsphere.py (modified) (1 diff)
• img/mass_surface_fractal_1d.jpg (added)
• mass_surface_fractal.c (added)
• mass_surface_fractal.py (added)
• triaxial_ellipsoid.c (modified) (1 diff)

sasmodels/models/bcc.c

@@ -100 +100 @@
 
   double b3_x, b3_y, b1_x, b1_y, b2_x, b2_y; //b3_z,
-  double q_z;
+  //double q_z;
   double cos_val_b3, cos_val_b2, cos_val_b1;
   double a1_dot_q, a2_dot_q,a3_dot_q;
@@ -123 +123 @@
   const double latticescale = 2.0*(4.0/3.0)*M_PI*(radius*radius*radius)/(s1*s1*s1);
   // q vector
-  q_z = 0.0; // for SANS; assuming qz is negligible
+  //q_z = 0.0; // for SANS; assuming qz is negligible
   /// Angles here are respect to detector coordinate
   ///  instead of against q coordinate(PRB 36(46), 3(6), 1754(3854))

sasmodels/models/hardsphere.py

@@ -23 +23 @@
 
 
-.. figure:: img/HardSphere_1d.jpg
+.. figure:: img/hardSphere_1d.jpg
 
     1D plot using the default values (in linear scale).

sasmodels/models/triaxial_ellipsoid.c

@@ -20 +20 @@
 
     double sn, cn;
-    double st, ct;
+    //double st, ct;
     //const double lower = 0.0;
     //const double upper = 1.0;