Changeset 1399 for trunk/GSASIIIO.py


Ignore:
Timestamp:
Jun 30, 2014 10:40:05 AM (8 years ago)
Author:
vondreele
Message:

allow D (&T) for hydrogen atom types
allow ge* for image extensions (as found at APS 1ID!)
switch e11 & e22 definitions to match coordinate system (x horizontal, y vertical)
add subtraction of dark image for image display & strain fitting
skip images with no strain entries in fitallstrsta

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r1397 r1399  
    138138    if not ospath.exists(imagefile):
    139139        dlg = wx.FileDialog(G2frame, 'Bad image file name; choose name', '.', '',\
    140         'Any image file (*.edf;*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img)\
    141         |*.edf;*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img|\
     140        'Any image file (*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img)\
     141        |*.edf;*.tif;*.tiff;*.mar*;*.ge*;*.avg;*.sum;*.img|\
    142142        European detector file (*.edf)|*.edf|\
    143143        Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
    144144        MAR file (*.mar*)|*.mar*|\
    145         GE Image (*.avg;*.sum)|*.avg;*.sum|\
     145        GE Image (*.ge*;*.avg;*.sum)|*.ge*;*.avg;*.sum|\
    146146        ADSC Image (*.img)|*.img|\
    147147        All files (*.*)|*.*',wx.OPEN|wx.CHANGE_DIR)
     
    262262    elif ext == '.mar3450' or ext == '.mar2300':
    263263        Comments,Data,Npix,Image = GetMAR345Data(imagefile)
    264     elif ext in ['.sum','.avg','']:
     264    elif ext in ['.sum','.avg'] or 'ge' in ext:
    265265        Comments,Data,Npix,Image = GetGEsumData(imagefile)
    266266    elif ext == '.G2img':
     
    366366        head = ['GE detector sum data from APS 1-ID',]
    367367        sizexy = [2048,2048]
    368     elif '.avg' in filename:
    369         head = ['GE detector avg data from APS 1-ID',]
     368    elif '.avg' in filename or '.ge' in filename:
     369        head = ['GE detector avg or ge* data from APS 1-ID',]
    370370        sizexy = [2048,2048]
    371371    else:
     
    379379    if '.sum' in filename:
    380380        image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.int32)
    381     elif '.avg' in filename:
     381    elif '.avg' in filename or '.ge' in filename:
    382382        image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
    383383    else:
Note: See TracChangeset for help on using the changeset viewer.