Changeset 01c8d9e in sasmodels for sasmodels/modelinfo.py

Timestamp:

Aug 7, 2018 12:32:18 PM (6 years ago)

Author:

Suczewski <ges3@…>

Branches:

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

Children:

c11d09f

Parents:

707cbdb

Message:

beta approximation, first pass

File:

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

sasmodels/modelinfo.py

@@ -163 +163 @@
     parameter.length = length
     parameter.length_control = control
-
     return parameter
 
@@ -418 +417 @@
     # scale and background are implicit parameters
     COMMON = [Parameter(*p) for p in COMMON_PARAMETERS]
-
     def __init__(self, parameters):
         # type: (List[Parameter]) -> None
         self.kernel_parameters = parameters
         self._set_vector_lengths()
-
         self.npars = sum(p.length for p in self.kernel_parameters)
         self.nmagnetic = sum(p.length for p in self.kernel_parameters
@@ -430 +427 @@
         if self.nmagnetic:
             self.nvalues += 3 + 3*self.nmagnetic
-
         self.call_parameters = self._get_call_parameters()
         self.defaults = self._get_defaults()
@@ -444 +440 @@
         self.form_volume_parameters = [p for p in self.kernel_parameters
                                        if p.type == 'volume']
-
         # Theta offset
         offset = 0
@@ -466 +461 @@
         self.magnetism_index = [k for k, p in enumerate(self.call_parameters)
                                 if p.id.startswith('M0:')]
-
         self.pd_1d = set(p.name for p in self.call_parameters
                          if p.polydisperse and p.type not in ('orientation', 'magnetic'))
@@ -770 +764 @@
         # Custom sum/multi models
         return kernel_module.model_info
+
     info = ModelInfo()
     #print("make parameter table", kernel_module.parameters)
@@ -822 +817 @@
     info.lineno = {}
     _find_source_lines(info, kernel_module)
-
     return info