Changeset 01dba26 in sasmodels for sasmodels/compare.py


Ignore:
Timestamp:
Sep 12, 2018 5:17:58 PM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master
Children:
a5cb9bc
Parents:
55e82f0 (diff), 2c12061 (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.
Message:

Merge branch 'master' into ticket-608-user-defined-weights

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/compare.py

    rd0fdba2 r01dba26  
    12891289 
    12901290    if opts['datafile'] is not None: 
    1291         data = load_data(os.path.expanduser(opts['datafile'])) 
     1291        data0 = load_data(os.path.expanduser(opts['datafile'])) 
     1292        data = data0, data0 
    12921293    else: 
    12931294        # Hack around the fact that make_data doesn't take a pair of resolutions 
Note: See TracChangeset for help on using the changeset viewer.