Changeset 1374

Timestamp:

Jun 5, 2014 3:07:57 PM (9 years ago)

Author:

vondreele

Message:

recalibrate enable issues
save/load image controls

Location:

trunk

Files:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (4 diffs)
• GSASIIsasd.py (modified) (2 diffs)

trunk/GSASIIimage.py

@@ -534 +534 @@
     if data['DetDepthRef']:
         varyList.append('dep')
-    FitDetector(rings,varyList,parmDict)
+    chisq = FitDetector(rings,varyList,parmDict)
     data['distance'] = parmDict['dist']
     data['center'] = [parmDict['det-X'],parmDict['det-Y']]
@@ -540 +540 @@
     data['tilt'] = parmDict['tilt']
     data['DetDepth'] = parmDict['dep']
+    data['chisq'] = chisq
     N = len(data['ellipses'])
     data['ellipses'] = []           #clear away individual ellipse fits
@@ -716 +717 @@
                 data['tilt'] = parmDict['tilt']
                 data['DetDepth'] = parmDict['dep']
+                data['chisq'] = chisq
                 elcent,phi,radii = ellipse = GetEllipse(dsp,data)
                 print fmt2%('fitted ellipse:   ',elcent[0],elcent[1],phi,radii[0],radii[1],chisq,len(rings))

trunk/GSASIIimgGUI.py

@@ -247 +247 @@
                 keys = ['type','wavelength','calibrant','distance','center',
                     'tilt','rotation','azmthOff','fullIntegrate','LRazimuth',
-                    'IOtth','outAzimuths','invert_x','invert_y','DetDepth']
+                    'IOtth','outAzimuths','invert_x','invert_y','DetDepth',
+                    'calibskip','pixLimit','cutoff','calibdmin','chisq',
+                    'binType','SampleShape','PolaVal','SampleAbs','dark image','background image']
                 for key in keys:
-                    if key in ['rotation']:
-                        File.write(key+':'+str(data[key])+'\n')                        
-                    else:
-                        File.write(key+':'+str(data[key])+'\n')
+                    if key not in data:     #uncalibrated!
+                        continue
+                    File.write(key+':'+str(data[key])+'\n')
                 File.close()
         finally:
@@ -259 +260 @@
     def OnLoadControls(event):
         cntlList = ['wavelength','distance','tilt','invert_x','invert_y','type',
-            'fullIntegrate','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth']
+            'fullIntegrate','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth',
+            'calibskip','pixLimit','cutoff','calibdmin','chisq',
+            'PolaVal','SampleAbs','dark image','background image']
         dlg = wx.FileDialog(G2frame, 'Choose image controls file', '.', '', 
             'image control files (*.imctrl)|*.imctrl',wx.OPEN|wx.CHANGE_DIR)
@@ -273 +276 @@
                         continue
                     [key,val] = S[:-1].split(':')
-                    if key in ['type','calibrant',]:
+                    if key in ['type','calibrant','binType','SampleShape',]:    #strings
                         save[key] = val
                     elif key in ['rotation']:
@@ -931 +934 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnRecalibrate, id=G2gd.wxID_IMRECALIBRATE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnClearCalib, id=G2gd.wxID_IMCLEARCALIB)
-    if not data['rings']:
+    if 'chisq' not in data:
         G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)    
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrate, id=G2gd.wxID_IMINTEGRATE)

trunk/GSASIIsasd.py

@@ -476 +476 @@
     '''Computes structure factor for not dilute monodisperse hard sphere with a
     square well potential interaction. 
-    Refs.: SHARMA,SHARMA, PHYSICA 89A,(1977),212
+    Refs.: SHARMA,SHARMA, PHYSICA 89A,(1977),213-
     
     :param float Q: Q value array (A-1)
@@ -1372 +1372 @@
             Dist.append([])
     Ic[Ibeg:Ifin] += Back[0]
-    slitLen = Sample['SlitLen']
+    slitLen = Sample.get('SlitLen',0.)
     if slitLen:
         Ic[Ibeg:Ifin] = SmearData(Ic,Q,slitLen,Back[0])[Ibeg:Ifin]