Changeset bebdb87 in sasmodels

Timestamp:

Oct 28, 2017 8:49:07 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

3a45c2c

Parents:

6db17bd (diff), 1f35235 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (10/28/17 08:49:07)

git-committer:

GitHub <noreply@…> (10/28/17 08:49:07)

Message:

Merge pull request #53 from SasView?/ticket1006

Ticket 1006
closes #1006

Location:

sasmodels

Files:

• product.py (modified) (1 diff)
• sasview_model.py (modified) (3 diffs)
• generate.py (modified) (1 diff)

sasmodels/product.py

@@ -100 +100 @@
     # Remember the component info blocks so we can build the model
     model_info.composition = ('product', [p_info, s_info])
+    model_info.control = p_info.control
     # TODO: delegate random to p_info, s_info
     #model_info.random = lambda: {}

sasmodels/sasview_model.py

@@ -205 +205 @@
                                            structure_factor._model_info)
     ConstructedModel = make_model_from_info(model_info)
-    return ConstructedModel()
+    return ConstructedModel(form_factor.multiplicity)    
 
 
@@ -323 +323 @@
     #: True if model has multiplicity
     is_multiplicity_model = False
-    #: Mulitplicity information
+    #: Multiplicity information
     multiplicity_info = None # type: MultiplicityInfoType
 
@@ -354 +354 @@
         # and lines to plot.
 
-        # Get the list of hidden parameters given the mulitplicity
+        # Get the list of hidden parameters given the multiplicity
         # Don't include multiplicity in the list of parameters
         self.multiplicity = multiplicity

sasmodels/generate.py

@@ -370 +370 @@
     """
     # Note: need 0xffffffff&val to force an unsigned 32-bit number
+    try:
+        source = source.encode('utf8')
+    except AttributeError: # bytes has no encode attribute in python 3
+        pass
     return "%08X"%(0xffffffff&crc32(source))