Changeset 2742

Timestamp:

Mar 5, 2017 5:39:30 PM (6 years ago)

Author:

toby

Message:

Key on autointegration on setdist

File:

• trunk/GSASIIimgGUI.py (modified) (11 diffs)

trunk/GSASIIimgGUI.py

@@ -391 +391 @@
             'IOtth','outChannels','outAzimuths','invert_x','invert_y','DetDepth',
             'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg','varyList',
-            'binType','SampleShape','PolaVal','SampleAbs','dark image','background image']
+            'binType','SampleShape','PolaVal','SampleAbs','dark image','background image',
+            ]
         for key in keys:
             if key not in data:     #uncalibrated!
@@ -2244 +2245 @@
                         'fullIntegrate','outChannels','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth',
                         'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg',
-                        'PolaVal','SampleAbs','dark image','background image']
+                        'PolaVal','SampleAbs','dark image','background image','setdist']
     File = open(imctrl_file,'r')
     fullIntegrate = False
@@ -2680 +2681 @@
                     msg += 'Files to integrate from '+os.path.join(self.imagedir,value)+msg1
                 else:
-                    msg += 'All files integrated'
+                    msg += 'No files found to read'
         except IndexError:
             msg += 'Error searching for files named '+os.path.join(self.imagedir,value)
@@ -2769 +2770 @@
         #dist = self.controlsDict['distance']
         interpDict,imgctrl,immask = self.Evaluator(dist) # interpolated calibration values
-        #if GSASIIpath.GetConfigValue('debug'):
         if GSASIIpath.GetConfigValue('debug'):
             print 'interpolated values: ',interpDict
@@ -2902 +2902 @@
                 G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks'))
             if self.params['Mode'] == 'table': # look up parameter values from table
-                self.ResetFromTable(controlsDict['distance'])
+                self.ResetFromTable(controlsDict['setdist'])
             # update controls from master
             controlsDict.update(self.ImageControls)
@@ -3051 +3051 @@
         x = np.array([float(i) for i in parms[0]])
         closest = abs(x-dist).argmin()
-        D = {'distance':dist}
+        D = {'setdist':dist}
         imctfile = IMfileList[closest]
         if parms[-1][closest].lower() != '(none)':
@@ -3092 +3092 @@
     creates a dictionary with interpolated parameter values.
     '''
-    ParmList = ('distance','center_x','center_y','wavelength','tilt','rotation','DetDepth',
+    ParmList = ('setdist','distance','center_x','center_y','wavelength','tilt','rotation','DetDepth',
             'LRazimuth_min','LRazimuth_max','IOtth_min','IOtth_max','outChannels',
             'maskfile',
@@ -3098 +3098 @@
     nonInterpVars = ('tilt','rotation','LRazimuth_min','LRazimuth_max','IOtth_min','IOtth_max',
                      'outChannels')  # values in this list are taken from nearest rather than interpolated
-    HeaderList = ('Det Dist','X cntr','Y cntr','wavelength','tilt','rotation','DetDepth',
+    HeaderList = ('Set Dist','Calib Dist','X cntr','Y cntr','wavelength','tilt','rotation','DetDepth',
             'Azimuth min','Azimuth max','2Th min','2Th max','Int. pts',
             'Mask File',
@@ -3183 +3183 @@
             fileList = tmpDict.get('filenames','[]')
             parms = []
+            if 'setdist' not in tmpDict:
+                print(u'Old file, recreate before using: {}'.format(files[0]))
+                return [[]],[]
             for key in self.ParmList:
                 try:
@@ -3197 +3200 @@
         for file in files: # read all files; place in dict by distance
             imgDict = Read_imctrl(file)
-            tmpDict[imgDict.get('distance')] = imgDict
+            dist = imgDict.get('setdist')
+            if dist is None:
+                print('Skipping old file, redo: {}'.format(file))
+            tmpDict[dist] = imgDict
         parms = [[] for key in self.ParmList]
         fileList = []
@@ -3277 +3283 @@
             self.InsertColumn(i, lbl)
         for r,d in enumerate(parms[0]):
+            if d is None: continue
             if float(d) < 0: continue
             index = self.InsertStringItem(sys.maxint, d)