Changeset 2d81cfe in sasmodels for sasmodels/mixture.py

Timestamp:

Nov 29, 2017 1:13:23 PM (6 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:

237b800f

Parents:

a839b22

Message:

lint

File:

• sasmodels/mixture.py (modified) (5 diffs)

sasmodels/mixture.py

@@ -20 +20 @@
 from .details import make_details
 
+# pylint: disable=unused-import
 try:
     from typing import List
 except ImportError:
     pass
+# pylint: enable=unused-import
 
 def make_mixture_info(parts, operation='+'):
@@ -33 +35 @@
     combined_pars = []
 
-    model_num = 0
     all_parts = copy(parts)
     is_flat = False
@@ -89 +90 @@
             used_prefixes.append(prefix)
             prefix += '_'
-            
+
         if operation == '+':
             # If model is a sum model, each constituent model gets its own scale parameter
@@ -105 +106 @@
                 # Concatenate sub_prefixes to form prefix for the scale
                 scale_prefix = ''.join(sub_prefixes) + '_'
-            scale =  Parameter(scale_prefix + 'scale', default=1.0,
-                            description="model intensity for " + part.name)
+            scale = Parameter(scale_prefix + 'scale', default=1.0,
+                              description="model intensity for " + part.name)
             combined_pars.append(scale)
         for p in part.parameters.kernel_parameters:
@@ -179 +180 @@
         # type: (ModelInfo, List[Kernel]) -> None
         self.dim = kernels[0].dim
-        self.info =  model_info
+        self.info = model_info
         self.kernels = kernels
         self.dtype = self.kernels[0].dtype