Changeset 56b2687 in sasmodels for sasmodels/core.py
- Timestamp:
- Jul 14, 2016 1:35:58 PM (8 years ago)
- Branches:
- master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 98ba1fc
- Parents:
- 61f8638 (diff), fa800e72 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/core.py
r7891a2a r56b2687 34 34 pass 35 35 36 try: 37 np.meshgrid([]) 38 meshgrid = np.meshgrid 39 except Exception: 40 # CRUFT: np.meshgrid requires multiple vectors 41 def meshgrid(*args): 42 if len(args) > 1: 43 return np.meshgrid(*args) 44 else: 45 return [np.asarray(v) for v in args] 36 46 37 47 # TODO: refactor composite model support
Note: See TracChangeset
for help on using the changeset viewer.