Changeset 1384

Timestamp:

Jun 16, 2014 10:33:13 AM (9 years ago)

Author:

vondreele

Message:

Add option for additional 1/cos(2theta) correction for SASD.
Add display & possible edit of image pixel dimensions onto main image data window - big warning there. Other controls there??

Location:

trunk

Files:

• GSASIIIO.py (modified) (11 diffs)
• GSASIIgrid.py (modified) (1 diff)
• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -387 +387 @@
             nframes -= 1
     image = np.reshape(image,(sizexy[1],sizexy[0]))
-    data = {'pixelSize':(200,200),'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}  
+    data = {'pixelSize':[200,200],'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}  
     File.close()    
     if imageOnly:
@@ -591 +591 @@
         image = np.flipud(np.array(np.asarray(marFrame.image),dtype=np.int32))
         tifType = marFrame.filetitle
-        pixy = (marFrame.pixelsizeX/1000.0,marFrame.pixelsizeY/1000.0)
+        pixy = [marFrame.pixelsizeX/1000.0,marFrame.pixelsizeY/1000.0]
         head = marFrame.outputHead()
 # extract resonable wavelength from header
@@ -619 +619 @@
             tifType = 'Pilatus'
             dataType = 0
-            pixy = (172,172)
+            pixy = [172,172]
             File.seek(4096)
             if not imageOnly:
@@ -628 +628 @@
             if IFD[258][2][0] == 16:
                 tifType = 'GE'
-                pixy = (200,200)
+                pixy = [200,200]
                 File.seek(8)
                 if not imageOnly:
@@ -635 +635 @@
             elif IFD[258][2][0] == 32:
                 tifType = 'CHESS'
-                pixy = (200,200)
+                pixy = [200,200]
                 File.seek(8)
                 if not imageOnly:
@@ -643 +643 @@
     elif 262 in IFD and IFD[262][2][0] > 4:
         tifType = 'DND'
-        pixy = (158,158)
+        pixy = [158,158]
         File.seek(512)
         if not imageOnly:
@@ -650 +650 @@
     elif sizexy == [1536,1536]:
         tifType = 'APS Gold'
-        pixy = (150,150)
+        pixy = [150,150]
         File.seek(64)
         if not imageOnly:
@@ -659 +659 @@
             if IFD[258][2][0] == 32:
                 tifType = 'PE'
-                pixy = (200,200)
+                pixy = [200,200]
                 File.seek(8)
                 if not imageOnly:
@@ -670 +670 @@
         elif IFD[273][2][0] == 4096:
             if sizexy[0] == 3072:
-                pixy =  (73,73)
+                pixy =  [73,73]
                 tifType = 'MAR225'            
             else:
-                pixy = (158,158)
+                pixy = [158,158]
                 tifType = 'MAR325'            
             File.seek(4096)
@@ -690 +690 @@
             if IFD[258][2][0] == 16:
                 tifType = 'scanCCD'
-                pixy = (9,9)
+                pixy = [9,9]
                 File.seek(8)
                 if not imageOnly:
@@ -697 +697 @@
         elif IFD[273][2][0] == 4096:
             tifType = 'Rayonix'
-            pixy = (73.242,73.242)
+            pixy = [73.242,73.242]
             File.seek(4096)
             if not imageOnly:

trunk/GSASIIgrid.py

@@ -4765 +4765 @@
         elif 'IMG' in G2frame.PatternTree.GetItemText(item):
             G2frame.Image = item
+            G2frame.dataFrame.SetTitle('Image Data')
+            data = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId( \
+                G2frame,item,'Image Controls'))
+            G2imG.UpdateImageData(G2frame,data)
             G2plt.PlotImage(G2frame,newPlot=True)
         elif 'PKS' in G2frame.PatternTree.GetItemText(item):

trunk/GSASIIimage.py

@@ -882 +882 @@
         H1 = LRazm
     H0 /= npcosd(H2[:-1])           #**2? I don't think so, **1 is right for powders
+    if 'SASD' in data['Type']:
+        H0 /= npcosd(H2[:-1])           #one more for small angle scattering data?
     if data['Oblique'][1]:
         H0 /= G2pwd.Oblique(data['Oblique'][0],H2[:-1])

trunk/GSASIIimgGUI.py

@@ -39 +39 @@
 cosd = lambda x: math.cos(x*math.pi/180.)
 asind = lambda x: 180.*math.asin(x)/math.pi
+    
+################################################################################
+##### Image Data
+################################################################################
+def UpdateImageData(G2frame,data):
+    
+    def OnPixVal(event):
+        Obj = event.GetEventObject()
+        id = Indx[Obj.GetId()]
+        try:
+            data['pixelSize'][id] = min(500,max(10,float(Obj.GetValue())))
+        except ValueError:
+            pass
+        Obj.SetValue('%.3f'%(data['pixelSize'][id]))
+        G2plt.PlotExposedImage(G2frame,newPlot=True,event=event)
+        
+        
+        
+    if G2frame.dataDisplay:
+        G2frame.dataDisplay.Destroy()
+    if not G2frame.dataFrame.GetStatusBar():
+        G2frame.dataFrame.CreateStatusBar()
+    G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
+    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,
+        label='Do not change anything here unless you are absolutely sure!'),0,WACV)
+    pixSize = wx.FlexGridSizer(0,4,5,5)
+    pixLabels = [u'Pixel X-dimension (\xb5m)',u'Pixel Y-dimension (\xb5m)']
+    Indx = {}
+    for i,[pixLabel,pix] in enumerate(zip(pixLabels,data['pixelSize'])):
+        pixSize.Add(wx.StaticText(G2frame.dataDisplay,label=pixLabel),0,WACV)
+        pixVal = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(pix),style=wx.TE_PROCESS_ENTER)
+        Indx[pixVal.GetId()] = i
+        pixVal.Bind(wx.EVT_TEXT_ENTER,OnPixVal)
+        pixVal.Bind(wx.EVT_KILL_FOCUS,OnPixVal)
+        pixSize.Add(pixVal,0,WACV)
+    mainSizer.Add(pixSize,0)
+    
+    mainSizer.Layout()    
+    G2frame.dataDisplay.SetSizer(mainSizer)
+    fitSize = mainSizer.Fit(G2frame.dataFrame)
+    G2frame.dataFrame.setSizePosLeft(fitSize)
+    G2frame.dataDisplay.SetSize(fitSize)
 
 ################################################################################
@@ -63 +106 @@
             data['binType'] = 'log(q)'
 #end patch
-
     
 # Menu items