Changeset 3330 for trunk/imports/G2img_SFRM.py

Timestamp:

Mar 31, 2018 8:40:02 AM (5 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

File:

• trunk/imports/G2img_SFRM.py (modified) (5 diffs)

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]