Changeset 3362

Timestamp:

Apr 27, 2018 4:23:53 PM (5 years ago)

Author:

vondreele

Message:

fix azimuth offset problems with linescan
add sqrt & log (scanline) options

Location:

trunk

Files:

• GSASIIimage.py (modified) (2 diffs)
• GSASIIplot.py (modified) (5 diffs)

trunk/GSASIIimage.py

@@ -475 +475 @@
     numChans = data['outChannels']
     LUtth = np.array(data['IOtth'],dtype=np.float)
-    azm = data['linescan'][1]
+    azm = data['linescan'][1]-data['azmthOff']
     Tx = np.array([tth for tth in np.linspace(LUtth[0],LUtth[1],numChans+1)])
     Ty = np.zeros_like(Tx)
@@ -489 +489 @@
     Ty = image[xpix,ypix]
     Tx = ma.array(Tx,mask=Xpix.mask+Ypix.mask).compressed()
-    return Tx,Ty
+    return [Tx,Ty]
 
 def EdgeFinder(image,data):

trunk/GSASIIplot.py

@@ -5755 +5755 @@
             elif event.key in ['y',]:
                 Data['invert_y'] = not Data['invert_y']
+            elif event.key in ['s',] and Data['linescan'][0]:
+                G2frame.logPlot = False
+                G2frame.plotStyle['sqrtPlot'] = not G2frame.plotStyle['sqrtPlot']
+            elif event.key in ['n',] and Data['linescan'][0]:
+                G2frame.plotStyle['sqrtPlot'] = False
+                G2frame.logPlot = not G2frame.logPlot
             else:
                 return
@@ -5835 +5841 @@
                 xy = G2img.GetLineScan(G2frame.ImageZ,Data)
                 Plot1.cla()
+                if G2frame.logPlot:
+                    xy[1] = np.log(xy[1])
+                elif G2frame.plotStyle['sqrtPlot']:
+                    xy[1] = np.sqrt(xy[1])
                 Plot1.plot(xy[0],xy[1])
                 Plot1.set_xlim(Data['IOtth'])
@@ -6277 +6287 @@
         Plot1.set_ylabel('Intensity',fontsize=12)
         xy = G2img.GetLineScan(G2frame.ImageZ,Data)
+        if G2frame.logPlot:
+            xy[1] = np.log(xy[1])
+            Plot1.set_ylabel('log(Intensity)',fontsize=12)
+        elif G2frame.plotStyle['sqrtPlot']:
+            Plot1.set_ylabel(r'$\sqrt{Intensity}$',fontsize=12)
+            xy[1] = np.sqrt(xy[1])
         Plot1.plot(xy[0],xy[1])
         Plot1.set_xlim(Data['IOtth'])
@@ -6297 +6313 @@
     try:
         if G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Image Controls',]:
-            Page.Choice = (' key press','c: set beam center','d: set dmin','x: flip x','y: flip y',)
-#            if G2frame.logPlot:
-#                Page.Choice[1] = 'l: log(I) off'
+            Page.Choice = [' key press','c: set beam center','d: set dmin','x: flip x','y: flip y',]
+            if Data.get('linescan',[False,0.])[0]:
+                Page.Choice += ['s: toggle sqrt plot line scan','n: toggle log plot line scan']
             Page.keyPress = OnImPlotKeyPress
         elif G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Masks',]:
@@ -6390 +6406 @@
                 Plot.plot([arcxI[ind],arcxO[ind]],[arcyI[ind],arcyO[ind]],color='k',dashes=(5,5))
         if 'linescan' in Data and Data['linescan'][0]:
-            azm = Data['linescan'][1]
+            azm = Data['linescan'][1]-Data['azmthOff']
             IOtth = [0.1,60.]
             wave = Data['wavelength']