Changeset 6868151 in sasmodels for explore

Timestamp:

Feb 28, 2018 12:32:14 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

362a66f

Parents:

4f6f9431

Message:

realspace: fix sampling for cscyl rim

File:

• explore/realspace.py (modified) (1 diff)

explore/realspace.py

@@ -211 +211 @@
         values[abs(points[:, 2]) > self.length/(self.length + 2*self.thick_face)] = self.value_face
         # finally set value to rim value if outside the core ellipse
-        radius = (points[:, 0]**2*(1+(self.thick_rim/self.ra)**2)
-                  + points[:, 1]**2*(1+(self.thick_rim/self.rb)**2))
+        radius = (points[:, 0]**2*((self.ra + self.thick_rim)/self.ra)**2
+                  + points[:, 1]**2*((self.rb + self.thick_rim)/self.rb)**2)
         values[radius>1] = self.value_rim
         return values, self._adjust(self._scale*points)