Changeset 695


Ignore:
Timestamp:
Jul 26, 2012 1:21:18 PM (9 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r688 r695  
    326326            Value = st.unpack(byteOrd+nVal*'f',File.read(nVal*4))
    327327        IFD[Tag] = [Type,nVal,Value]
    328 #    for key in IFD:
    329 #        print key,IFD[key]
     328#        print Tag,IFD[Tag]
    330329    sizexy = [IFD[256][2][0],IFD[257][2][0]]
    331330    [nx,ny] = sizexy
     
    377376                print 'Read MAR CCD tiff file: ',filename
    378377            image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
     378        elif IFD[273][2][0] == 512:
     379            tiftype = '11-ID-C'
     380            pixy = [200,200]
     381            File.seek(512)
     382            if not imageOnly:
     383                print 'Read 11-ID-C tiff file: ',filename
     384            image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)           
    379385    elif sizexy == [4096,4096]:
    380386        if IFD[273][2][0] == 8:
     
    504510        W = 1./Y                    #probably not true
    505511        Sample = G2pdG.SetDefaultSample()
     512        Sample['Gonio. radius'] = data['distance']
    506513        if Id:
    507514            G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Comments'),Comments)                   
  • trunk/GSASIIimage.py

    r675 r695  
    171171        B = dist,x0,y0,phi,tilt
    172172        return ellipseCalcD(B,xyd,wave)
    173        
     173               
    174174    names = ['distance','det-X0','det-Y0','rotate','tilt','wavelength']
    175175    fmt = ['%12.2f','%12.2f','%12.2f','%12.2f','%12.2f','%12.5f']   
     
    194194        return result[0],resultW[0][-1]       
    195195    except ValueError:
    196         print 'Bad wavelength refinement - no result'
     196        print 'Bad refinement - no result'
    197197        return result[0],wave
     198       
    198199           
    199200def ImageLocalMax(image,w,Xpix,Ypix):
  • trunk/GSASIIstruct.py

    r694 r695  
    25292529            ymb = np.where(ymb==0.,1.0,ymb)
    25302530            ycmb = np.array(yc-yb)
    2531             ratio = ymb/ycmb           
     2531            ratio = np.where(ycmb<>0.,ymb/ycmb,0.0)         
    25322532            refLists = Histogram['Reflection Lists']
    25332533            for phase in refLists:
Note: See TracChangeset for help on using the changeset viewer.