Changeset 3361

Timestamp:

Apr 27, 2018 11:25:22 AM (5 years ago)

Author:

vondreele

Message:

use label to identify integration limit lines in image plots
change default pixel size from 200x200 to 74.8x74.8 (nexus files have pixel size so unaffected) for hdf5 image files

Location:

trunk

Files:

• GSASIIplot.py (modified) (7 diffs)
• imports/G2img_HDF5.py (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -5634 +5634 @@
                     ypos = event.ydata-ycent
                     tth,azm = G2img.GetTthAzm(event.xdata,event.ydata,Data)
-                    if 'line3' in  str(item) or 'line4' in str(item) and not Data['fullIntegrate']:
+                    if 'Lazm' in  str(item) or 'Uazm' in str(item) and not Data['fullIntegrate']:
                         Page.SetToolTipString('%6d deg'%(azm))
-                    elif 'line1' in  str(item) or 'line2' in str(item):
+                    elif 'Itth' in  str(item) or 'Otth' in str(item):
                         Page.SetToolTipString('%8.3f deg'%(tth))
                     elif 'linescan' in str(item):
@@ -5770 +5770 @@
             tth,azm,D,dsp = G2img.GetTthAzmDsp(event.xdata,event.ydata,Data)
             itemPicked = str(G2frame.itemPicked)
-            if 'line1' in itemPicked and 'Line2D' in itemPicked:
+            if 'Itth' in itemPicked:
                 Data['IOtth'][0] = max(tth,0.001)
-            elif 'line2' in itemPicked and 'Line2D' in itemPicked:
+            elif 'Otth' in itemPicked:
                 Data['IOtth'][1] = tth
-            elif 'line3' in itemPicked and 'Line2D' in itemPicked:
+            elif 'Lazm' in itemPicked:
                 Data['LRazimuth'][0] = int(azm)
                 Data['LRazimuth'][0] %= 360
-            elif 'line4' in itemPicked  and 'Line2D' in itemPicked:
+            elif 'Uazm' in itemPicked:
                 Data['LRazimuth'][1] = int(azm)
                 Data['LRazimuth'][1] %= 360
@@ -5818 +5818 @@
 
             Page.canvas.restore_region(savedplot)
-            if 'line1' in itemPicked and 'Line2D' in itemPicked:
+            if 'Itth' in itemPicked:
                 pick.set_data([arcxI,arcyI])
-            elif 'line2' in itemPicked and 'Line2D' in itemPicked:
+            elif 'Otth' in itemPicked:
                 pick.set_data([arcxO,arcyO])
-            elif 'line3' in itemPicked and 'Line2D' in itemPicked:
+            elif 'Lazm' in itemPicked:
                 pick.set_data([[arcxI[0],arcxO[0]],[arcyI[0],arcyO[0]]])
-            elif 'line4' in itemPicked  and 'Line2D' in itemPicked:
+            elif 'Uazm' in itemPicked:
                 pick.set_data([[arcxI[-1],arcxO[-1]],[arcyI[-1],arcyO[-1]]])
             elif 'linescan' in itemPicked:
-                azm = Data['linescan'][1]
+                azm = Data['linescan'][1]-AzmthOff
                 dspI = wave/(2.0*sind(0.1/2.0))
                 xyI = G2img.GetDetectorXY(dspI,azm,Data)
@@ -5838 +5838 @@
                 Plot1.set_xlim(Data['IOtth'])
                 Plot1.set_xscale("linear")                                                  
+                Plot1.set_title('Line scan at azm= %6.1f'%(azm+AzmthOff))
                 Page.canvas.draw()
                 
@@ -6202 +6203 @@
                         rings.remove(ring)
             elif 'Line2D' in itemPicked and treeItem == 'Image Controls':
-                if 'line1' in itemPicked:
+                if 'Itth' in itemPicked:
                     Data['IOtth'][0] = max(tth,0.001)
-                elif 'line2' in itemPicked:
+                elif 'Otth' in itemPicked:
                     Data['IOtth'][1] = tth
-                elif 'line3' in itemPicked:
+                elif 'Lazm' in itemPicked:
                     Data['LRazimuth'][0] = int(azm)
-                elif 'line4' in itemPicked and not Data['fullIntegrate']:
+                elif 'Uazm' in itemPicked and not Data['fullIntegrate']:
                     Data['LRazimuth'][1] = int(azm)
 
@@ -6368 +6369 @@
                     xyI = np.array(xyI)
                     arcxI,arcyI = xyI.T
-                    Plot.plot(arcxI,arcyI,picker=3)
+                    Plot.plot(arcxI,arcyI,picker=3,label='Itth')
             if ellO:
                 xyO = []
@@ -6378 +6379 @@
                     xyO = np.array(xyO)
                     arcxO,arcyO = xyO.T                
-                    Plot.plot(arcxO,arcyO,picker=3)
+                    Plot.plot(arcxO,arcyO,picker=3,label='Otth')
             if ellO and ellI:
-                Plot.plot([arcxI[0],arcxO[0]],[arcyI[0],arcyO[0]],picker=3)
-                Plot.plot([arcxI[-1],arcxO[-1]],[arcyI[-1],arcyO[-1]],picker=3)
+                Plot.plot([arcxI[0],arcxO[0]],[arcyI[0],arcyO[0]],picker=3,label='Lazm')
+                Plot.plot([arcxI[-1],arcxO[-1]],[arcyI[-1],arcyO[-1]],picker=3,label='Uazm')
             for i in range(Nazm):
                 cake = LRAzim[0]+i*delAzm-AzmthOff

trunk/imports/G2img_HDF5.py

@@ -110 +110 @@
                         else:
                             print('Skipping entry '+str(dset.name)+'. Shape is '+str(dims))
+                        break
         self.buffer['imagemap'] = []
         fp.visititems(func)
@@ -131 +132 @@
         sizexy = list(image.shape) 
         Npix = sizexy[0]*sizexy[1]
-        data = {'pixelSize':[200.,200.],'wavelength':0.15,'distance':1000.,
+        data = {'pixelSize':[74.8,74.8],'wavelength':0.15,'distance':1000.,
                 'center':[sizexy[0]*0.1,sizexy[1]*0.1],'size':sizexy}
         for item in self.Comments: