Changeset 3330

Timestamp:

Mar 31, 2018 8:40:02 AM (6 years ago)

Author:

vondreele

Message:

modify Bruker image import to keep "TARGET" and use it in SaveIntegration? to put Ka1/Ka2 wavelengths into PWDR Instrument Parameters

Location:

trunk

Files:

• GSASIIIO.py (modified) (3 diffs)
• imports/G2img_SFRM.py (modified) (5 diffs)

trunk/GSASIIIO.py

@@ -688 +688 @@
 def SaveIntegration(G2frame,PickId,data,Overwrite=False):
     'Save image integration results as powder pattern(s)'
+    waves = {'Cu':[1.54051,1.54433],'Ti':[2.74841,2.75207],'Cr':[2.28962,2.29351],
+        'Fe':[1.93597,1.93991],'Co':[1.78892,1.79278],'Mo':[0.70926,0.713543],
+        'Ag':[0.559363,0.563775]}
     azms = G2frame.Integrate[1]
     X = G2frame.Integrate[2][:-1]
@@ -697 +700 @@
     Controls = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.root, 'Controls'))
     if 'PWDR' in name:
-        names = ['Type','Lam','Zero','Polariz.','U','V','W','X','Y','Z','SH/L','Azimuth'] 
-        codes = [0 for i in range(12)]
+        if 'target' in data:
+            names = ['Type','Lam1','Lam2','I(L2)/I(L1)','Zero','Polariz.','U','V','W','X','Y','Z','SH/L','Azimuth'] 
+            codes = [0 for i in range(14)]
+        else:
+            names = ['Type','Lam','Zero','Polariz.','U','V','W','X','Y','Z','SH/L','Azimuth'] 
+            codes = [0 for i in range(12)]
     elif 'SASD' in name:
         names = ['Type','Lam','Zero','Azimuth'] 
@@ -758 +765 @@
                         Controls['FreePrm'+num] = item.split('=')[1].strip()
         if 'PWDR' in Aname:
-            parms = ['PXC',data['wavelength'],0.0,polariz,1.0,-0.10,0.4,0.30,1.0,0.0,0.0001,Azms[i]]
+            if 'target' in data:    #from lab x-ray 2D imaging data
+                wave1,wave2 = waves[data['target']]
+                parms = ['PXC',wave1,wave2,0.5,0.0,polariz,290.,-40.,30.,6.,-14.,0.0,0.0001,Azms[i]]
+            else:
+                parms = ['PXC',data['wavelength'],0.0,polariz,1.0,-0.10,0.4,0.30,1.0,0.0,0.0001,Azms[i]]
         elif 'SASD' in Aname:
             Sample['Trans'] = data['SampleAbs'][0]

trunk/imports/G2img_SFRM.py

@@ -17 +17 @@
 import GSASIIobj as G2obj
 import GSASIIpath
-import struct as st
 import numpy as np
-import unpack_cbf as cbf
 GSASIIpath.SetVersionNumber("$Revision: 3207 $")
 class SFRM_ReaderClass(G2obj.ImportImage):
@@ -29 +27 @@
             strictExtension=True,
             formatName = 'SFRM image',
-            longFormatName = 'SFRM Binary Data Format image file'
+            longFormatName = 'Bruker SFRM Binary Data Format image file'
             )
 
@@ -38 +36 @@
         
     def Reader(self,filename, ParentFrame=None, **unused):
-        '''Read using Bob's routine :func:`GetCbfData`
+        '''Read using Bob's routine :func:`GetSFRMData`
         '''
         self.Comments,self.Data,self.Npix,self.Image = GetSFRMData(self,filename)
@@ -73 +71 @@
         if 'TARGET' in line:
             wave = meanwaves[fields[0]]
+            target = fields[0].capitalize()
         elif 'DISTANC' in line:
             dist = float(fields[0])*10.
-#        elif 'Pixel_size' in line:
-#            pixSize = [float(fields[2])*1.e6,float(fields[5])*1.e6]
         elif 'CENTER' in line:
             cent = [float(fields[0]),float(fields[1])]
@@ -116 +113 @@
     image = np.reshape(img,(sizexy[1],sizexy[0]))
     print ('import time: %.3f'%(time.time()-time0))
-    data = {'pixelSize':pixSize,'wavelength':wave,'distance':dist,'center':cent,'size':sizexy}
+    data = {'pixelSize':pixSize,'wavelength':wave,'distance':dist,'center':cent,'size':sizexy,'target':target}
     Npix = sizexy[0]*sizexy[1]