Changeset 2086


Ignore:
Timestamp:
Dec 8, 2015 2:18:46 PM (6 years ago)
Author:
toby
Message:

17-BM autoint fixes and improvements; remove atmdata.dat (not used)

Location:
trunk
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r2084 r2086  
    20172017                    dist = controlsDict['distance']
    20182018                    interpDict,imgctrl,immask = self.Evaluator(dist) # interpolated calibration values
    2019                     if GSASIIpath.GetConfigValue('debug'):
    2020                         print 'interpolated: ',interpDict
     2019                    #if GSASIIpath.GetConfigValue('debug'):
     2020                    print 'interpolated: ',interpDict
    20212021                    self.ImageControls = ReadControls(imgctrl)
    20222022                    self.ImageControls.update(interpDict)
     
    25702570        fil = '(none)'
    25712571        try:
    2572             dlg = wx.FileDialog(G2frame, 'Select mask or control file to add (Press cancel if none)',
     2572            dlg = wx.FileDialog(self, 'Select mask or control file to add (Press cancel if none)',
    25732573                                style=wx.OPEN,
    25742574                                wildcard='Add GSAS-II mask file (.immask)|*.immask|add image control file (.imctrl)|*.imctrl')
  • trunk/imports/G2img_1TIF.py

    r2068 r2086  
    9696        for line in head:
    9797            line = line.strip()
    98             if 'dataType=' in line:
     98            if '=' not in line: continue
     99            if 'dataType' in line:
    99100                dataType = int(line.split('=')[1])
     101            elif 'wavelength' in line.lower():
     102                wavelength = float(line.split('=')[1])
     103            elif 'distance' in line.lower():
     104                distance = float(line.split('=')[1])
    100105        Meta.close()
    101106    except IOError:
Note: See TracChangeset for help on using the changeset viewer.