Ignore:
Timestamp:
Jun 27, 2016 9:48:51 AM (6 years ago)
Author:
vondreele
Message:

implement Steven Weigand's fixes for Pilatus 'I' for 'L'
do a 'fix' for powderCif files with value(esd) for powder profile points
add a couple of comments for tutorial stuff

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/imports/G2img_1TIF.py

    r2299 r2347  
    164164# extract resonable distance from header
    165165        distance = (marFrame.startXtalToDetector+marFrame.endXtalToDetector)*5e-4
    166         distance = (distance <= 0) and marFrame.xtalToDetector*1e-3 or distance
     166        distance = (distance <= marFrame.startXtalToDetector*5e-4) and marFrame.xtalToDetector*1e-3 or distance
    167167        distance = (distance <= 0) and None or distance
    168168# extract resonable center from header
     
    197197            File.seek(4096)
    198198            print 'Read Pilatus tiff file: ',filename
    199             image = ar.array('L',File.read(4*Npix))
     199            image = ar.array('I',File.read(4*Npix))
    200200            image = np.array(np.asarray(image),dtype=np.int32)
    201201        else:
     
    211211                File.seek(8)
    212212                print 'Read CHESS-detector tiff file: ',filename
    213                 image = np.array(ar.array('L',File.read(4*Npix)),dtype=np.int32)
     213                image = np.array(ar.array('I',File.read(4*Npix)),dtype=np.int32)
    214214    elif 270 in IFD:
    215215        File.seek(IFD[270][2][0])
Note: See TracChangeset for help on using the changeset viewer.