Changeset f4878dc in sasmodels

Timestamp:

Mar 17, 2016 12:26:22 PM (9 years ago)

Author:

wojciech

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:

d8509a6

Parents:

684eff9

Message:

Core shell cylinder model reverted

Location:

sasmodels/models

Files:

• core_shell_cylinder.c (modified) (1 diff)
• core_shell_cylinder.py (modified) (1 diff)

sasmodels/models/core_shell_cylinder.c

@@ -11 +11 @@
 double _cyl(double twovd, double besarg, double siarg)
 {
-    const double bj = (besarg == 0.0 ? 0.5 : j1(besarg)/besarg);
+    const double bj = (besarg == 0.0 ? 0.5 : J1(besarg)/besarg);
     const double si = (siarg == 0.0 ? 1.0 : sin(siarg)/siarg);
     return twovd*si*bj;

sasmodels/models/core_shell_cylinder.py

@@ -127 +127 @@
              ]
 
-source = ["lib/polevl.c", "lib/j1d.c", "lib/gauss76.c", "core_shell_cylinder.c"]
+source = ["lib/J1.c", "lib/gauss76.c", "core_shell_cylinder.c"]
 
 def ER(radius, thickness, length):