Changeset 9eb3632 in sasmodels for sasmodels/modelinfo.py

Timestamp:

Jul 23, 2016 12:54:17 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

7b7da6b

Parents:

6a0d6aa

Message:

restructure kernels using fixed PD loops

File:

• sasmodels/modelinfo.py (modified) (2 diffs)

sasmodels/modelinfo.py

@@ -416 +416 @@
 
         self.npars = sum(p.length for p in self.kernel_parameters)
-        self.num_magnetic = sum(p.length for p in self.kernel_parameters
-                                if p.type=='sld')
+        self.nmagnetic = sum(p.length for p in self.kernel_parameters
+                             if p.type=='sld')
+        self.nvalues = 2 + self.npars
+        if self.nmagnetic:
+            self.nvalues += 3 + 3*self.nmagnetic
 
         self.call_parameters = self._get_call_parameters()
@@ -522 +525 @@
 
         # Add the magnetic parameters to the end of the call parameter list.
-        if self.num_magnetic > 0:
+        if self.nmagnetic > 0:
             full_list.extend([
                 Parameter('up:frac_i', '', 0., [0., 1.],