Changeset 2892


Ignore:
Timestamp:
Jul 1, 2017 2:58:01 PM (6 years ago)
Author:
vondreele
Message:

ddataGui fix & np.fmax --> np.amax (wrong max function) in phsGUI

Location:
branch/2frame
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branch/2frame/GSASIIddataGUI.py

    r2888 r2892  
    10031003        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,'  (This project has no data; use Import to read it)'),
    10041004                      0,WACV|wx.TOP,10)
    1005     elif not UseListG2frame.dataFrame.HistsInPhase:
     1005    elif not UseList in G2frame.dataFrame.HistsInPhase:
    10061006        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,'  (This phase has no associated data; use appropriate Edit/Add... menu item)'),
    10071007                      0,WACV|wx.TOP,10)

  • branch/2frame/GSASIIphsGUI.py

    r2888 r2892  
    76497649        if 'Map Peaks' in data:
    76507650            mapPeaks = np.array(data['Map Peaks'])
    7651             peakMax = np.fmax(mapPeaks.T[0])
     7651            peakMax = np.amax(mapPeaks.T[0])
    76527652            Ind = MapPeaks.GetSelectedRows()
    76537653            for ind in Ind:
Note: See TracChangeset for help on using the changeset viewer.