Changeset 2436

Timestamp:

Aug 19, 2016 9:13:58 AM (5 years ago)

Author:

vondreele

Message:

implement decimal azimuth ranges (from integer)

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (5 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -323 +323 @@
         Data['calibrant'] = ''
         Data['IOtth'] = [2.0,5.0]
-        Data['LRazimuth'] = [135,225]
+        Data['LRazimuth'] = [0.,180.]
         Data['azmthOff'] = 0.0
         Data['outChannels'] = 2500

trunk/GSASIIimgGUI.py

@@ -684 +684 @@
         def OnLRazim(event):
             event.Skip()
-            Lazm = int(G2frame.Lazim.GetValue())%360
-            Razm = int(G2frame.Razim.GetValue())%360
+            Lazm = float(G2frame.Lazim.GetValue())%360.
+            Razm = float(G2frame.Razim.GetValue())%360.
             if Lazm > Razm:
-                Razm += 360
+                Razm += 360.
             if data['fullIntegrate']:
-                Razm = Lazm+360
-            G2frame.Lazim.SetValue("%6d" % (Lazm))
-            G2frame.Razim.SetValue("%6d" % (Razm))
+                Razm = Lazm+360.
+            G2frame.Lazim.SetValue("%6.1f" % (Lazm))
+            G2frame.Razim.SetValue("%6.1f" % (Razm))
             data['LRazimuth'] = [Lazm,Razm]
             wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)
@@ -767 +767 @@
             if data['fullIntegrate']:
                 data['fullIntegrate'] = False
-                data['LRazimuth'] = [Lazm,Lazm+20]
+                data['LRazimuth'] = [Lazm,Lazm+20.]
             else:
                 data['fullIntegrate'] = True
-                data['LRazimuth'] = [Lazm,Lazm+360]
+                data['LRazimuth'] = [Lazm,Lazm+360.]
             wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
             G2plt.PlotExposedImage(G2frame,event=event)
@@ -837 +837 @@
         littleSizer = wx.BoxSizer(wx.HORIZONTAL)
         G2frame.Lazim = wx.TextCtrl(parent=G2frame.dataDisplay,
-            value=("%6d" % (LRazim[0])),style=wx.TE_PROCESS_ENTER)
+            value=("%6.1f" % (LRazim[0])),style=wx.TE_PROCESS_ENTER)
         G2frame.Lazim.Bind(wx.EVT_TEXT_ENTER,OnLRazim)
         G2frame.Lazim.Bind(wx.EVT_KILL_FOCUS,OnLRazim)
         littleSizer.Add(G2frame.Lazim,0,WACV)
         G2frame.Razim = wx.TextCtrl(parent=G2frame.dataDisplay,
-            value=("%6d" % (LRazim[1])),style=wx.TE_PROCESS_ENTER)
+            value=("%6.1f" % (LRazim[1])),style=wx.TE_PROCESS_ENTER)
         G2frame.Razim.Bind(wx.EVT_TEXT_ENTER,OnLRazim)
         G2frame.Razim.Bind(wx.EVT_KILL_FOCUS,OnLRazim)
@@ -848 +848 @@
             G2frame.Razim.Enable(False)
             G2frame.Razim.SetBackgroundColour(VERY_LIGHT_GREY)
-            G2frame.Razim.SetValue("%6d" % (LRazim[0]+360))
+            G2frame.Razim.SetValue("%6.1f" % (LRazim[0]+360.))
         littleSizer.Add(G2frame.Razim,0,WACV)
         dataSizer.Add(littleSizer,0,)
@@ -2158 +2158 @@
     finally:
         File.close()
-        if fullIntegrate: save['LRazimuth_min'],save['LRazimuth_max'] = 0,0
+        if fullIntegrate: save['LRazimuth_min'],save['LRazimuth_max'] = 0.,0.
     return save
     

trunk/GSASIIplot.py

@@ -4465 +4465 @@
             dspO = wave/(2.0*sind(IOtth[1]/2.0))
             ellO = G2img.GetEllipse(dspO,Data)           #Ditto & more likely for outer ellipse
-            Azm = np.array(range(LRAzim[0],LRAzim[1]+1))-AzmthOff
+            Azm = np.arange(LRAzim[0],LRAzim[1]+1.)-AzmthOff
             if ellI:
                 xyI = []