Changeset 1925 for trunk/GSASIIIO.py


Ignore:
Timestamp:
Jul 10, 2015 3:50:10 PM (6 years ago)
Author:
vondreele
Message:

create AddHatomDialog? & work on OnHydAtomAdd?
allow reading of .cor images made at APS 1ID

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r1920 r1925  
    178178    if not os.path.exists(imagefile):
    179179        dlg = wx.FileDialog(G2frame, 'Previous image file not found; open here', '.', '',\
    180         'Any image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img)\
    181         |*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img|\
     180        'Any image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.cor)\
     181        |*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img;*.cor|\
    182182        European detector file (*.edf)|*.edf|\
    183183        Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
    184184        MAR file (*.mar*)|*.mar*|\
    185         GE Image (*.ge*;*.avg;*.sum)|*.ge*;*.avg;*.sum|\
     185        GE Image (*.ge*;*.avg;*.sum;*.cor)|*.ge*;*.avg;*.sum;*.cor|\
    186186        ADSC Image (*.img)|*.img|\
    187187        All files (*.*)|*.*',wx.OPEN|wx.CHANGE_DIR)
     
    303303    elif ext in ['.mar3450','.mar2300','.mar2560']:
    304304        Comments,Data,Npix,Image = GetMAR345Data(imagefile)
    305     elif ext in ['.sum','.avg'] or 'ge' in ext:
     305    elif ext in ['.sum','.avg','.cor'] or 'ge' in ext:
    306306        Comments,Data,Npix,Image = GetGEsumData(imagefile)
    307307    elif ext == '.G2img':
     
    410410        print 'Read GE sum file: ',filename   
    411411    File = open(filename,'rb')
    412     if '.sum' in filename:
    413         head = ['GE detector sum data from APS 1-ID',]
     412    if '.sum' in filename or '.cor' in filename:
     413        head = ['GE detector sum or cor data from APS 1-ID',]
    414414        sizexy = [2048,2048]
    415415    elif '.avg' in filename or '.ge' in filename:
     
    424424        File.seek(pos)
    425425    Npix = sizexy[0]*sizexy[1]
    426     if '.sum' in filename:
     426    if '.sum' in filename or '.cor' in filename:
    427427        image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.int32)
    428428    elif '.avg' in filename or '.ge' in filename:
Note: See TracChangeset for help on using the changeset viewer.