Changeset 1441

Timestamp:

Jul 24, 2014 12:18:15 PM (11 years ago)

Author:

vondreele

Message:

include option to plot unit structure factors (equal circles)

File:

• trunk/GSASIIplot.py (modified) (5 diffs)

trunk/GSASIIplot.py ¶

@@ -256 +256 @@
         i = zones.index(Data['Zone'])
         newPlot = False
-        typeChoice = {'1':'|DFsq|>sig','3':'|DFsq|>3sig','w':'|DFsq|/sig','f':'Fo','s':'Fosq'}
+        pwdrChoice = {'f':'Fo','s':'Fosq','i':'Unit Fc'}
+        hklfChoice = {'1':'|DFsq|>sig','3':'|DFsq|>3sig','w':'|DFsq|/sig','f':'Fo','s':'Fosq','i':'Unit Fc'}
         if event.key == 'h':
             Data['Zone'] = '100'
@@ -276 +277 @@
         elif event.key == '0':
             Data['Layer'] = 0
-        elif event.key in typeChoice and 'HKLF' in Name:
-            Data['Type'] = typeChoice[event.key]            
+            Data['Scale'] = 1.0
+        elif event.key in hklfChoice and 'HKLF' in Name:
+            Data['Type'] = hklfChoice[event.key]            
             newPlot = True
+        elif event.key in pwdrChoice and 'PWDR' in Name:
+            Data['Type'] = pwdrChoice[event.key]            
+            newPlot = True       
         PlotSngl(G2frame,newPlot,Data,hklRef,Title)
 
@@ -337 +342 @@
         Page.canvas.mpl_connect('key_press_event', OnSCKeyPress)
         Page.keyPress = OnSCKeyPress
+        Page.Choice = (' key press','u: increase scale','d: decrease scale',
+            'h: select 100 zone','k: select 010 zone','l: select 001 zone',
+            'f: select Fo','s: select Fosq','i: select unit Fc',
+            '+: increase index','-: decrease index','0: zero layer',)
         if 'HKLF' in Name:
-            Page.Choice = (' key press','u: increase scale','d: decrease scale',
-                'f: select Fo','s: select Fosq','w: select |DFsq|/sig',
-                '1: select |DFsq|>sig','3 select |DFsq|>3sig',
-                'h: select 100 zone','k: select 010 zone','l: select 001 zone',
-                '+: increase index','-: decrease index','0: zero layer',)
-        else:    
-            Page.Choice = (' key press','u: increase scale','d: decrease scale',
-                'h: select 100 zone','k: select 010 zone','l: select 001 zone',
-                '+: increase index','-: decrease index','0: zero layer',)
+            Page.Choice += ('w: select |DFsq|/sig','1: select |DFsq|>sig','3: select |DFsq|>3sig',)
     Page.SetFocus()
     
@@ -363 +364 @@
     pzone = [[1,2],[0,2],[0,1]]
     izone = zones.index(Data['Zone'])
-    Plot.set_title(Data['Type']+' '+Title)
+    Plot.set_title(Data['Type']+' for '+Title)
     HKL = []
     HKLF = []
@@ -386 +387 @@
                 B = scale*math.sqrt(max(0,Fcsq))/FoMax
                 C = abs(A-B)
+            elif Type == 'Unit Fc':
+                A = scale/2
+                B = scale/2
+                C = 0.0
+                if Fcsq and Fosq > 0:
+                    A *= min(1.0,Fosq/Fcsq)
+                    C = abs(A-B)
             elif Type == '|DFsq|/sig':
                 if sig > 0.: