Changeset 695

Timestamp:

Jul 26, 2012 1:21:18 PM (11 years ago)

Author:

vondreele

Message:

read 11-ID-C tiff images & transfer det-sample dist from image calib. to gonio. radius upon image integration

Location:

trunk

Files:

• GSASIIIO.py (modified) (3 diffs)
• GSASIIimage.py (modified) (2 diffs)
• GSASIIstruct.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -326 +326 @@
             Value = st.unpack(byteOrd+nVal*'f',File.read(nVal*4))
         IFD[Tag] = [Type,nVal,Value]
-#    for key in IFD:
-#        print key,IFD[key]
+#        print Tag,IFD[Tag]
     sizexy = [IFD[256][2][0],IFD[257][2][0]]
     [nx,ny] = sizexy
@@ -377 +376 @@
                 print 'Read MAR CCD tiff file: ',filename
             image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+        elif IFD[273][2][0] == 512:
+            tiftype = '11-ID-C'
+            pixy = [200,200]
+            File.seek(512)
+            if not imageOnly:
+                print 'Read 11-ID-C tiff file: ',filename
+            image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)            
     elif sizexy == [4096,4096]:
         if IFD[273][2][0] == 8:
@@ -504 +510 @@
         W = 1./Y                    #probably not true
         Sample = G2pdG.SetDefaultSample()
+        Sample['Gonio. radius'] = data['distance']
         if Id:
             G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Comments'),Comments)                    

trunk/GSASIIimage.py

@@ -171 +171 @@
         B = dist,x0,y0,phi,tilt
         return ellipseCalcD(B,xyd,wave)
-        
+                
     names = ['distance','det-X0','det-Y0','rotate','tilt','wavelength']
     fmt = ['%12.2f','%12.2f','%12.2f','%12.2f','%12.2f','%12.5f']   
@@ -194 +194 @@
         return result[0],resultW[0][-1]        
     except ValueError:
-        print 'Bad wavelength refinement - no result'
+        print 'Bad refinement - no result'
         return result[0],wave
+        
             
 def ImageLocalMax(image,w,Xpix,Ypix):

trunk/GSASIIstruct.py

@@ -2529 +2529 @@
             ymb = np.where(ymb==0.,1.0,ymb)
             ycmb = np.array(yc-yb)
-            ratio = ymb/ycmb            
+            ratio = np.where(ycmb<>0.,ymb/ycmb,0.0)          
             refLists = Histogram['Reflection Lists']
             for phase in refLists: