Changeset 1694 for trunk

Timestamp:

Mar 10, 2015 11:35:24 AM (10 years ago)

Author:

vondreele

Message:

some missing stuff in PWDR[0] dictionary
add new fxn to G2img - meanAZm - calc effective azimuth for a azm range for correct polarization calc.
fix some FlexGridSizers? in G2phsGUI
fix '+'/'=' key response for Anaconda vs Enthought versions; one sees '=' the other sees '+'!
fix L/R shifting in waterfall plots.

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIIO.py (modified) (3 diffs)
• GSASIIimage.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (10 diffs)

trunk/GSASII.py ¶

@@ -1325 +1325 @@
                 'Dummy':False,
                 'ranId':ran.randint(0,sys.maxint),
+                'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,'refDelt':0.01,
+                'qPlot':False,'dPlot':False,'sqrtPlot':False
                 }
             rd.Sample['ranId'] = valuesdict['ranId'] # this should be removed someday
@@ -1498 +1500 @@
             'Dummy':True,
             'ranId':ran.randint(0,sys.maxint),
+            'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,'refDelt':0.01,
+            'qPlot':False,'dPlot':False,'sqrtPlot':False
             }
         self.PatternTree.SetItemPyData(Id,[valuesdict,rd.powderdata])

trunk/GSASIIIO.py ¶

@@ -35 +35 @@
 import GSASIIlattice as G2lat
 import GSASIIpwdGUI as G2pdG
+import GSASIIimage as G2img
 import GSASIIElem as G2el
 import GSASIIstrIO as G2stIO
@@ -1040 +1041 @@
     else:
         for i,azm in enumerate(azms[:-1]):
-            Azms.append((azms[i+1]+azm)/2.)
+            Azms.append(G2img.meanAzm(azm,azms[i+1]))
     for i,azm in enumerate(azms[:-1]):
         Aname = name+" Azm= %.2f"%(Azms[i])
@@ -1088 +1089 @@
             'Dummy':False,
             'ranId':ran.randint(0,sys.maxint),
+            'Offset':[0.0,0.0],'delOffset':0.02,'refOffset':-1.0,'refDelt':0.01,
+            'qPlot':False,'dPlot':False,'sqrtPlot':False
             }
         G2frame.PatternTree.SetItemPyData(

trunk/GSASIIimage.py ¶

@@ -49 +49 @@
 npatand = lambda x: 180.*np.arctan(x)/np.pi
 npatan2d = lambda y,x: 180.*np.arctan2(y,x)/np.pi
-    
 debug = False
     
@@ -428 +427 @@
     'Give azimuth value for detector x,y position; calibration info in data'
     return GetTthAzmDsp(x,y,data)[1]
+    
+def meanAzm(a,b):
+    AZM = lambda a,b: npacosd(0.5*(npsind(2.*b)-npsind(2.*a))/(np.pi*(b-a)/180.))/2.
+    azm = AZM(a,b)
+    quad = int((a+b)/180.)
+    if quad == 1:
+        azm = 180.-azm
+    elif quad == 2:
+        azm += 180.
+    elif quad == 3:
+        azm = 360-azm
+    return azm      
        
 def ImageCompress(image,scale):

trunk/GSASIIphsGUI.py ¶

@@ -2182 +2182 @@
                         else:
                             names = Names[:2]
-                        Waves = wx.FlexGridSizer(1,4,5,5)
+                        Waves = wx.FlexGridSizer(0,4,5,5)
                     elif Stype == 'Spos':
                         if waveType in ['ZigZag','Sawtooth'] and not iwave:
                             names = Names[6:]
-                            Waves = wx.FlexGridSizer(1,6,5,5)
+                            Waves = wx.FlexGridSizer(0,6,5,5)
                             waveName = waveType
                         else:
                             names = Names[:6]
-                            Waves = wx.FlexGridSizer(1,8,5,5)
+                            Waves = wx.FlexGridSizer(0,8,5,5)
                     else:
                         names = Names
-                        Waves = wx.FlexGridSizer(1,8,5,5)
+                        Waves = wx.FlexGridSizer(0,8,5,5)
                     waveSizer.Add(wx.StaticText(waveData,label=' %s  parameters: %s'%(waveName,str(names).rstrip(']').lstrip('[').replace("'",''))),0,WACV)
                     for ival,val in enumerate(wave[0]):

trunk/GSASIIplot.py ¶

@@ -340 +340 @@
         elif event.key == 'd':
             Data['Scale'] /= 1.1
-        elif event.key == '+':
+        elif event.key in ['+','=']:
             Data['Layer'] = min(Data['Layer']+1,HKLmax[i])
         elif event.key == '-':
@@ -592 +592 @@
         elif key in 'B':
             ifBox = not ifBox
-        elif key == '+':
+        elif key in ['+','=']:
             Data['Scale'] *= 1.25
         elif key == '-':
@@ -1047 +1047 @@
             G2frame.SinglePlot = not G2frame.SinglePlot                
             newPlot = True
-        elif event.key == '+':
+        elif event.key in ['+','=']:
             if G2frame.PickId:
                 G2frame.PickId = False
@@ -1424 +1424 @@
         Ymax = max(Ymax,max(xye[1]))
     if Ymax is None: return # nothing to plot
-    offset = Pattern[0]['Offset'][0]*Ymax/100.0
+    offsetX = Pattern[0]['Offset'][1]
+    offsetY = Pattern[0]['Offset'][0]
     if G2frame.logPlot:
         Title = 'log('+Title+')'
@@ -1501 +1502 @@
                 np.seterr(invalid=olderr['invalid'])
             else:
-                Y = xye[1]+offset*N
+                Y = xye[1]+offsetY*N*Ymax/100.0
         elif 'SASD' in plottype:
             B = xye[5]
             if G2frame.sqPlot:
-                Y = xye[1]*Sample['Scale'][0]*(1.05)**(Pattern[0]['Offset'][0]*N)*X**4
+                Y = xye[1]*Sample['Scale'][0]*(1.05)**(offsetY*N)*X**4
             else:
-                Y = xye[1]*Sample['Scale'][0]*(1.05)**(Pattern[0]['Offset'][0]*N)
+                Y = xye[1]*Sample['Scale'][0]*(1.05)**(offsetY*N)
         if LimitId and ifpicked:
             limits = np.array(G2frame.PatternTree.GetItemPyData(LimitId))
@@ -1533 +1534 @@
         else:
             if 'SASD' in plottype and G2frame.logPlot:
-                X *= (1.01)**(Pattern[0]['Offset'][1]*N)
+                X *= (1.01)**(offsetX*N)
             else:
-                X += Pattern[0]['Offset'][1]*.005*N
+                X += offsetX*.005*N
             Xum = ma.getdata(X)
             DifLine = ['']
@@ -1544 +1545 @@
                     np.seterr(invalid=olderr['invalid'])
                 else:
-                    Z = xye[3]+offset*N
+                    Z = xye[3]+offsetY*N*Ymax/100.0
                 if 'PWDR' in plottype:
                     if Pattern[0]['sqrtPlot']:
@@ -1552 +1553 @@
                         D = np.where(xye[5],(Y-Z),0.)-Ymax*Pattern[0]['delOffset']
                     else:
-                        W = xye[4]+offset*N
+                        W = xye[4]+offsetY*N*Ymax/100.0
                         D = xye[5]-Ymax*Pattern[0]['delOffset']  #powder background
                 elif 'SASD' in plottype:
@@ -2809 +2810 @@
     def OnPlotKeyPress(event):
         global Off,Atom,Ax
-        newPlot = False        
+        newPlot = False
         if event.key == '0':
             Off = 0
-        elif event.key == '+':
+        elif event.key in ['+','=']:
             Off += 1
         elif event.key == '-':
@@ -4237 +4238 @@
             SetPeakRoll(dirDict[key])
             SetMapPeaksText(mapPeaks)
-        elif key in ['+','-','0'] and generalData['Type'] in ['modulated','magnetic']:
+        elif key in ['+','-','=','0'] and generalData['Type'] in ['modulated','magnetic']:
             if key == '0':
                 G2frame.tau = 0.
-            elif key =='+':
+            elif key in ['+','=']:
                 G2frame.tau += 0.05
-            elif key =='-':
+            elif key == '-':
                 G2frame.tau -= 0.05
             G2frame.tau %= 1.   #force 0-1 range