Changeset bebdb87 in sasmodels


Ignore:
Timestamp:
Oct 28, 2017 6:49:07 AM (6 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 06:49:07)
git-committer:
GitHub <noreply@…> (10/28/17 06:49:07)
Message:

Merge pull request #53 from SasView?/ticket1006

Ticket 1006
closes #1006

Location:
sasmodels
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/product.py

    r058460c r1f35235  
    100100    # Remember the component info blocks so we can build the model 
    101101    model_info.composition = ('product', [p_info, s_info]) 
     102    model_info.control = p_info.control 
    102103    # TODO: delegate random to p_info, s_info 
    103104    #model_info.random = lambda: {} 
  • sasmodels/sasview_model.py

    r9f8ade1 r1f35235  
    205205                                           structure_factor._model_info) 
    206206    ConstructedModel = make_model_from_info(model_info) 
    207     return ConstructedModel() 
     207    return ConstructedModel(form_factor.multiplicity)     
    208208 
    209209 
     
    323323    #: True if model has multiplicity 
    324324    is_multiplicity_model = False 
    325     #: Mulitplicity information 
     325    #: Multiplicity information 
    326326    multiplicity_info = None # type: MultiplicityInfoType 
    327327 
     
    354354        # and lines to plot. 
    355355 
    356         # Get the list of hidden parameters given the mulitplicity 
     356        # Get the list of hidden parameters given the multiplicity 
    357357        # Don't include multiplicity in the list of parameters 
    358358        self.multiplicity = multiplicity 
  • sasmodels/generate.py

    r30b60d2 r6db17bd  
    370370    """ 
    371371    # Note: need 0xffffffff&val to force an unsigned 32-bit number 
     372    try: 
     373        source = source.encode('utf8') 
     374    except AttributeError: # bytes has no encode attribute in python 3 
     375        pass 
    372376    return "%08X"%(0xffffffff&crc32(source)) 
    373377 
Note: See TracChangeset for help on using the changeset viewer.