Changeset 1949

Timestamp:

Aug 3, 2015 10:21:47 AM (8 years ago)

Author:

vondreele

Message:

add image read for Rigaku R-Axis IV files

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIIO.py (modified) (5 diffs)

trunk/GSASII.py

@@ -2335 +2335 @@
         dlg = wx.FileDialog(
             self, 'Choose image files', '.', '',
-            'Any supported image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.G2img;*.png)|'
-            '*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.G2img;*.png;*.zip|'
+            'Any supported image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.stl;*.G2img;*.png)|'
+            '*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.stl;*.G2img;*.png;*.zip|'
             'European detector file (*.edf)|*.edf|'
             'Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|'
@@ -2342 +2342 @@
             'GE Image (*.ge*;*.avg;*.sum)|*.ge*;*.avg;*.sum|'
             'ADSC Image (*.img)|*.img|'
+            'Rigaku R-Axis IV (*.stl)|*.stl|'
             'GSAS-II Image (*.G2img)|*.G2img|'
             'Portable Network Graphics image (*.png)|*.png|'

trunk/GSASIIIO.py

@@ -178 +178 @@
     if not os.path.exists(imagefile):
         dlg = wx.FileDialog(G2frame, 'Previous image file not found; open here', '.', '',\
-        'Any image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.cor)\
-        |*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.cor|\
+        'Any image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.cor;*.stl)\
+        |*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.cor;*.stl|\
         European detector file (*.edf)|*.edf|\
         Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
@@ -185 +185 @@
         GE Image (*.ge*;*.avg;*.sum;*.cor)|*.ge*;*.avg;*.sum;*.cor|\
         ADSC Image (*.img)|*.img|\
+        Rigaku-Axis4 (*.stl)|*.stl|\
         All files (*.*)|*.*',wx.OPEN|wx.CHANGE_DIR)
         try:
@@ -311 +312 @@
         if not imageOnly:
             EditImageParms(G2frame,Data,Comments,Image,imagefile)
+    elif ext == '.stl':
+        Comments,Data,Npix,Image = GetRigaku(imagefile)
+#        if not imageOnly:
+#            EditImageParms(G2frame,Data,Comments,Image,imagefile)
     else:
         print 'Extension for file '+imagefile+' not recognized'
@@ -369 +374 @@
         elif 'Size' in line:
             imSize = int(fields[2])
-        elif 'DataType' in lines:
-            dType = fields[2]
+#        elif 'DataType' in lines:
+#            dType = fields[2]
         elif 'pixel_size_x' in line:
             pixSize[0] = float(fields[2])
@@ -402 +407 @@
     else:
         return head,data,Npix,image
+        
+def GetRigaku(filename,imageOnly=False):
+    'Read Rigaku R-Axis IV image file'
+    import struct as st
+    import array as ar
+    if not imageOnly:
+        print 'Read Rigaku R-Axis IV file: ',filename    
+    File = open(filename,'rb')
+    fileSize = os.stat(filename).st_size
+    Npix = (fileSize-6000)/2
+    Head = File.read(6000)
+    head = ['Rigaku R-Axis IV detector data',]
+    image = np.array(ar.array('H',File.read(fileSize-6000)),dtype=np.int32)
+    print fileSize,image.shape
+    print head
+    if Npix == 9000000:
+        sizexy = [3000,3000]
+        pixSize = [100.,100.]        
+    elif Npix == 2250000:
+        sizexy = [1500,1500]
+        pixSize = [200.,200.]
+    else:
+        sizexy = [6000,6000]
+        pixSize = [50.,50.] 
+    image = np.reshape(image,(sizexy[1],sizexy[0]))        
+    data = {'pixelSize':pixSize,'wavelength':1.5428,'distance':250.0,'center':[150.,150.],'size':sizexy}  
+    File.close()    
+    if imageOnly:
+        return image
+    else:
+        return head,data,Npix,image
+    
         
 def GetGEsumData(filename,imageOnly=False):