Changeset 883ecf4 in sasmodels


Ignore:
Timestamp:
Aug 2, 2017 4:39:09 PM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
9f6823b
Parents:
2d07219
Message:

paper bag fixes for rushed commits

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/compare.py

    rbd21b12 r883ecf4  
    669669    model = core.build_model(model_info, dtype=dtype, platform="dll") 
    670670    calculator = DirectModel(data, model, cutoff=cutoff) 
    671     calculator.engine = "OMP%s"%DTYPE_MAP[dtype] 
     671    calculator.engine = "OMP%s"%DTYPE_MAP[str(model.dtype)] 
    672672    return calculator 
    673673 

  • sasmodels/kernelpy.py

    rb139ee6 r883ecf4  
    3333        _create_default_functions(model_info) 
    3434        self.info = model_info 
     35        self.dtype = np.dtype('d') 
    3536 
    3637    def make_kernel(self, q_vectors): 
Note: See TracChangeset for help on using the changeset viewer.