Ignore:
Timestamp:
Nov 15, 2018 2:09:18 PM (6 years ago)
Author:
Jeff Krzywon <jkrzywon@…>
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249
Children:
9220e89c
Parents:
a165bee (diff), f560e23 (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-1111

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/file_reader_base_class.py

    r9b08354 rc222c27  
    241241                    data.xmax = np.max(data.qx_data) 
    242242                    data.ymin = np.min(data.qy_data) 
    243                     data.ymax = np.max(data.qx_data) 
     243                    data.ymax = np.max(data.qy_data) 
    244244 
    245245    @staticmethod 
Note: See TracChangeset for help on using the changeset viewer.