Changeset 496b252 in sasmodels for Kernel-Lamellar.cpp

Timestamp:

Jul 11, 2014 3:09:57 PM (10 years ago)

Author:

HMP1 <helen.park@…>

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:

8a21ba3

Parents:

be5d7df

Message:

core shell cylinder is fixed; float converted to real so is interchangeable

File:

• Kernel-Lamellar.cpp (modified) (1 diff)

Kernel-Lamellar.cpp

@@ -7 +7 @@
     {
         real q = sqrt(qx[i]*qx[i]+qy[i]*qy[i]);
-        real pi = 4.0*atan(1.0);
-        real Pq = 2.0*sub*(sub/q)/q*(1.0-cos(q*bi_thick));
-        ret[i] = 2.0*pi*scale*Pq/(q*q)/bi_thick*1.0e8 ;
+        ret[i] = 2.0*4.0*atan(1.0)*scale*2.0*sub*(sub/q)/q*(1.0-cos(q*bi_thick))/(q*q)/bi_thick*1.0e8 ;
     }
 }