Changeset a953943 in sasmodels for Kernel

Timestamp:

Aug 8, 2014 4:29:10 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:

4001d6e

Parents:

ae7d639

Message:

The Core-Shell isn't working

Location:

Kernel

Files:

• Kernel-CoreShellCylinder_f.cpp (added)
• Kernel-Cylinder_f.cpp (modified) (3 diffs)
• Kernel-Ellipse_f.cpp (modified) (2 diffs)

Kernel/Kernel-Cylinder_f.cpp

@@ -85 +85 @@
                 const real lv = loops[2*(li+Nradius)];
                 const real lw = loops[2*(li+Nradius)+1];
-                vol += rw*lw*rv*rv*lv*Ntheta*Nphi;
-               norm_vol += rw*lw*Ntheta*Nphi;
                 for (int thi=0; thi < Ntheta; thi++) {
                     const real thv = loops[2*(thi+Nradius+Nlength)];
@@ -100 +98 @@
                             ret += f(qxi, qyi, sub, rv, lv, weight, thv, phv);
                             norm += weight;
+                            vol += rw*lw*rv*rv*lv;
+                            norm_vol += rw*lw;
                         }
                     }
@@ -105 +105 @@
             }
         }
-        if (Ntheta>1) norm = norm/(M_PI/2);
+        //if (Ntheta>1) norm = norm/(M_PI/2);
         if (vol != REAL(0.0) && norm_vol != REAL(0.0)) {
             ret *= norm_vol/vol;

Kernel/Kernel-Ellipse_f.cpp

@@ -73 +73 @@
                 const real rbv = loops[2*(bi+Nradius_a)];
                 const real rbw = loops[2*(bi+Nradius_a)+1];
-                vol += raw*rbw*rav*rbv*rbv*Ntheta*Nphi;
-                norm_vol += raw*rbw*Ntheta*Nphi;
                 for (int thi=0; thi < Ntheta; thi++) {
                     const real thv = loops[2*(thi+Nradius_a+Nradius_b)];
@@ -88 +86 @@
                             ret += f(qxi, qyi, sub, rav, rbv, weight, thv, phv);
                             norm += weight;
+                            vol += raw*rbw*rav*rbv*rbv;
+                            norm_vol += raw*rbw;
                         }
                     }