Changeset 1131

Timestamp:

Oct 30, 2013 4:00:33 PM (10 years ago)

Author:

vondreele

Message:

fix to read Chess A2 tiff files
add polarization correction to SASD type patterns (show as PWDR for now)
fix to polygon & frame selection

Location:

trunk

Files:

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

trunk/GSASIIIO.py

@@ -477 +477 @@
             image = ar.array('L',File.read(4*Npix))
             image = np.array(np.asarray(image),dtype=np.int32)
+        else:
+            if IFD[258][2][0] == 16:
+                print sizexy
+                tifType = 'GE'
+                pixy = (200,200)
+                File.seek(8)
+                if not imageOnly:
+                    print 'Read GE-detector tiff file: ',filename
+                image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+            
     elif 262 in IFD and IFD[262][2][0] > 4:
         tifType = 'DND'
@@ -503 +513 @@
                 else:
                     image = np.array(ar.array('I',File.read(4*Npix)),dtype=np.int32)
+                
         elif IFD[273][2][0] == 4096:
             if sizexy[0] == 3072:

trunk/GSASIIimage.py

@@ -808 +808 @@
         else:
             H1 = LRazm
-        H0[0] /= npcosd(H2[:-1])**2
+        H0 /= npcosd(H2[:-1])**2
         if data['Oblique'][1]:
-            H0[0] /= G2pwd.Oblique(data['Oblique'][0],H2[:-1])
+            H0 /= G2pwd.Oblique(data['Oblique'][0],H2[:-1])
+        if 'SASD' in data['type'] and data['PolaVal'][1]:
+            H0 /= np.array([G2pwd.Polarization(data['PolaVal'][0],H2[:-1],Azm=azm)[0] for azm in H1[:-1]+np.diff(H1)])
         Nup += 1
         dlg.Update(Nup)

trunk/GSASIIimgGUI.py

@@ -253 +253 @@
         def OnDataType(event):
             data['type'] = typeSel.GetValue()[:4]
+            wx.CallAfter(UpdateImageControls,G2frame,data,masks)
     
         def OnNewColorBar(event):
@@ -265 +266 @@
                 pass
             azmthOff.SetValue("%.2f"%(data['azmthOff']))          #reset in case of error  
+            G2plt.PlotExposedImage(G2frame,event=event)
         
         comboSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -523 +525 @@
             G2plt.PlotExposedImage(G2frame,event=event)
                 
-        dataSizer = wx.FlexGridSizer(5,2,5,5)
+        def OnApplyPola(event):
+            if data['PolaVal'][1]:
+                data['PolaVal'][1] = False
+            else:
+                data['PolaVal'][1] = True
+                
+        def OnPolaVal(event):
+            try:
+                value = float(polaVal.GetValue())
+                if 0.001 <= value <= 0.999:
+                    data['PolaVal'][0] = value
+                else:
+                    raise ValueError
+            except ValueError:
+                pass
+            polaVal.SetValue('%.3f'%(data['PolaVal'][0]))
+                           
+        dataSizer = wx.FlexGridSizer(5,2,5,3)
         dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Integration coefficients'),0,
             wx.ALIGN_CENTER_VERTICAL)    
@@ -586 +605 @@
         littleSizer.Add(obliqVal,0,wx.ALIGN_CENTER_VERTICAL)
         dataSizer.Add(littleSizer,0,)
+        if 'SASD' in data['type']:
+            littleSizer = wx.BoxSizer(wx.HORIZONTAL)
+            setPolariz = wx.CheckBox(parent=G2frame.dataDisplay,label='Apply polarization?')
+            dataSizer.Add(setPolariz,0,wx.ALIGN_CENTER_VERTICAL)
+            setPolariz.Bind(wx.EVT_CHECKBOX, OnApplyPola)
+            setPolariz.SetValue(data['PolaVal'][1])
+            littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label='Value (0.001-0.999)  '),0,
+                wx.ALIGN_CENTER_VERTICAL)
+            polaVal = wx.TextCtrl(parent=G2frame.dataDisplay,value='%.3f'%(data['PolaVal'][0]),
+                style=wx.TE_PROCESS_ENTER)
+            polaVal.Bind(wx.EVT_TEXT_ENTER,OnPolaVal)
+            polaVal.Bind(wx.EVT_KILL_FOCUS,OnPolaVal)
+            littleSizer.Add(polaVal,0,wx.ALIGN_CENTER_VERTICAL)
+            dataSizer.Add(littleSizer,0,)
         
         showLines = wx.CheckBox(parent=G2frame.dataDisplay,label='Show integration limits?')
@@ -772 +805 @@
     if 'Oblique' not in data:
         data['Oblique'] = [0.5,False]
+    if 'PolaVal' not in data:
+        data['PolaVal'] = [0.99,False]
     #end fix
     

trunk/GSASIIplot.py

@@ -2266 +2266 @@
             elif G2frame.MaskKey =='p':
                 polygon = Masks['Polygons'][-1]
-                if len(polygon) > 2 and event.mouseevent.button == 3:
+                if len(polygon) > 2 and event.button == 3:
                     x0,y0 = polygon[0]
                     polygon.append([x0,y0])
@@ -2276 +2276 @@
             elif G2frame.MaskKey =='f':
                 frame = Masks['Frames']
-                if len(frame) > 2 and event.mouseevent.button == 3:
+                if len(frame) > 2 and event.button == 3:
                     x0,y0 = frame[0]
                     frame.append([x0,y0])

trunk/GSASIIpwd.py

@@ -163 +163 @@
     
 def Oblique(ObCoeff,Tth):
-    'needs a doc string'
+    'currently assumes detector is normal to beam'
     if ObCoeff:
         return (1.-ObCoeff)/(1.0-np.exp(np.log(ObCoeff)/npcosd(Tth)))