Changeset 2477


Ignore:
Timestamp:
Sep 23, 2016 10:36:39 AM (5 years ago)
Author:
vondreele
Message:

fix bug in integration limits
set better default plot offsets for reflection marks & difference curve.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r2436 r2477  
    764764           
    765765        def OnFullIntegrate(event):
    766             Lazm =int(G2frame.Lazim.GetValue())
     766            Lazm = float(G2frame.Lazim.GetValue())
    767767            if data['fullIntegrate']:
    768768                data['fullIntegrate'] = False
  • trunk/GSASIIplot.py

    r2476 r2477  
    11581158    data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
    11591159    if 'Offset' not in data[0] and plotType in ['PWDR','SASD']:     #plot offset data
    1160         data[0].update({'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,
    1161             'refDelt':0.01,})
     1160        Ymax = max(data[1][1])
     1161        data[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,
     1162            'refDelt':0.1*Ymax,})
    11621163        G2frame.PatternTree.SetItemPyData(G2frame.PickId,data)
    11631164#end patch
     
    12011202            elif G2frame.SinglePlot:
    12021203                G2frame.plotStyle['sqrtPlot'] = not G2frame.plotStyle['sqrtPlot']
     1204                Ymax = max(Pattern[1][1])
    12031205                if G2frame.plotStyle['sqrtPlot']:
    1204                     Pattern[0]['delOffset'] = .002
    1205                     Pattern[0]['refOffset'] = -1.0
    1206                     Pattern[0]['refDelt'] = .001
     1206                    Pattern[0]['delOffset'] = .002*Ymax
     1207                    Pattern[0]['refOffset'] = -0.1*Ymax
     1208                    Pattern[0]['refDelt'] = .1*Ymax
    12071209                else:
    1208                     Pattern[0]['delOffset'] = .02
    1209                     Pattern[0]['refOffset'] = -1.0
    1210                     Pattern[0]['refDelt'] = .01
     1210                    Pattern[0]['delOffset'] = .02*Ymax
     1211                    Pattern[0]['refOffset'] = -0.1*Ymax
     1212                    Pattern[0]['refDelt'] = .1*Ymax
    12111213            newPlot = True
    12121214        elif event.key == 'u' and (G2frame.Contour or not G2frame.SinglePlot):
     
    17011703                    Pattern.append(G2frame.PatternTree.GetItemText(item))
    17021704                if 'Offset' not in Pattern[0]:     #plot offset data
    1703                     Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,'refDelt':0.01,})
     1705                    Ymax = max(Pattern[1][1])
     1706                    Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,'refDelt':0.1*Ymax,})
    17041707                PlotList.append(Pattern)
    17051708                ParmList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
Note: See TracChangeset for help on using the changeset viewer.