Changeset 2086

Timestamp:

Dec 8, 2015 2:18:46 PM (10 years ago)

Author:

toby

Message:

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

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (2 diffs)
• atmdata.dat (deleted)
• imports/G2img_1TIF.py (modified) (1 diff)

trunk/GSASIIimgGUI.py ¶

@@ -2017 +2017 @@
                     dist = controlsDict['distance']
                     interpDict,imgctrl,immask = self.Evaluator(dist) # interpolated calibration values
-                    if GSASIIpath.GetConfigValue('debug'):
-                        print 'interpolated: ',interpDict
+                    #if GSASIIpath.GetConfigValue('debug'):
+                    print 'interpolated: ',interpDict
                     self.ImageControls = ReadControls(imgctrl)
                     self.ImageControls.update(interpDict)
@@ -2570 +2570 @@
         fil = '(none)'
         try:
-            dlg = wx.FileDialog(G2frame, 'Select mask or control file to add (Press cancel if none)', 
+            dlg = wx.FileDialog(self, 'Select mask or control file to add (Press cancel if none)', 
                                 style=wx.OPEN,
                                 wildcard='Add GSAS-II mask file (.immask)|*.immask|add image control file (.imctrl)|*.imctrl')

trunk/imports/G2img_1TIF.py ¶

@@ -96 +96 @@
         for line in head:
             line = line.strip()
-            if 'dataType=' in line:
+            if '=' not in line: continue
+            if 'dataType' in line:
                 dataType = int(line.split('=')[1])
+            elif 'wavelength' in line.lower():
+                wavelength = float(line.split('=')[1])
+            elif 'distance' in line.lower():
+                distance = float(line.split('=')[1])
         Meta.close()
     except IOError: