Changeset 32e3c9b in sasmodels for sasmodels/sasview_model.py

Timestamp:

Jul 21, 2016 2:08:04 PM (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:

b966a96

Parents:

42356c8

Message:

dll version of magnetic sld

File:

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

sasmodels/sasview_model.py

@@ -152 +152 @@
             orientation_params.append(p.name+".width")
             fixed.append(p.name+".width")
-        if p.type == 'magnetic':
+        elif p.type == 'magnetic':
             orientation_params.append(p.name)
             magnetic_params.append(p.name)
             fixed.append(p.name+".width")
+
 
     # Build class dictionary
@@ -512 +513 @@
                  for p in self._model_info.parameters.call_parameters]
         call_details, value = kernel.build_details(calculator, pairs)
-        result = calculator(call_details, value, cutoff=self.cutoff)
+        result = calculator(call_details, value, cutoff=self.cutoff, magnetic=False)
         calculator.release()
         return result