Changeset 2477

Timestamp:

Sep 23, 2016 10:36:39 AM (9 years ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIimgGUI.py ¶

@@ -764 +764 @@
             
         def OnFullIntegrate(event):
-            Lazm =int(G2frame.Lazim.GetValue())
+            Lazm = float(G2frame.Lazim.GetValue())
             if data['fullIntegrate']:
                 data['fullIntegrate'] = False

trunk/GSASIIplot.py ¶

@@ -1158 +1158 @@
     data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
     if 'Offset' not in data[0] and plotType in ['PWDR','SASD']:     #plot offset data
-        data[0].update({'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,
-            'refDelt':0.01,})
+        Ymax = max(data[1][1])
+        data[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,
+            'refDelt':0.1*Ymax,})
         G2frame.PatternTree.SetItemPyData(G2frame.PickId,data)
 #end patch
@@ -1201 +1202 @@
             elif G2frame.SinglePlot:
                 G2frame.plotStyle['sqrtPlot'] = not G2frame.plotStyle['sqrtPlot']
+                Ymax = max(Pattern[1][1])
                 if G2frame.plotStyle['sqrtPlot']:
-                    Pattern[0]['delOffset'] = .002
-                    Pattern[0]['refOffset'] = -1.0
-                    Pattern[0]['refDelt'] = .001
+                    Pattern[0]['delOffset'] = .002*Ymax
+                    Pattern[0]['refOffset'] = -0.1*Ymax
+                    Pattern[0]['refDelt'] = .1*Ymax
                 else:
-                    Pattern[0]['delOffset'] = .02
-                    Pattern[0]['refOffset'] = -1.0
-                    Pattern[0]['refDelt'] = .01
+                    Pattern[0]['delOffset'] = .02*Ymax
+                    Pattern[0]['refOffset'] = -0.1*Ymax
+                    Pattern[0]['refDelt'] = .1*Ymax
             newPlot = True
         elif event.key == 'u' and (G2frame.Contour or not G2frame.SinglePlot):
@@ -1701 +1703 @@
                     Pattern.append(G2frame.PatternTree.GetItemText(item))
                 if 'Offset' not in Pattern[0]:     #plot offset data
-                    Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,'refDelt':0.01,})
+                    Ymax = max(Pattern[1][1])
+                    Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,'refDelt':0.1*Ymax,})
                 PlotList.append(Pattern)
                 ParmList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,