Changeset 1300 for trunk/GSASIIpwdGUI.py

Timestamp:

Apr 25, 2014 12:47:06 PM (9 years ago)

Author:

vondreele

Message:

Add additional column to SASD profile - contains fixed background
remove contour plotting from SASD data
Add background file to SASD models GUI
this change breaks old SASD gpx files, they will need to be recreated!

File:

• trunk/GSASIIpwdGUI.py (modified) (10 diffs)

trunk/GSASIIpwdGUI.py

@@ -121 +121 @@
         'IPG':{'Niter':100,'Approach':0.8,'Power':-1},'Reg':{},},            
         'Particle':{'Matrix':{'Name':'vacuum','VolFrac':[0.0,False]},'Levels':[],},
-        'Current':'Size dist.',
+        'Current':'Size dist.','BackFile':'',
         }
         
@@ -2667 +2667 @@
     if 'Matrix' not in data['Particle']:
         data['Particle']['Matrix'] = {'Name':'vacuum','VolFrac':[0.0,False]}
+    if 'BackFile' not in data:
+        data['BackFile'] = ''
     #end patches
     
@@ -2719 +2721 @@
         for item in copyList:
             Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
-            G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Models'),
-                copy.deepcopy(data))
+            newdata = copy.deepcopy(data)
+            G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Models'),newdata)
+            if newdata['BackFile']:
+                Profile = G2frame.PatternTree.GetItemPyData(Id)[1]
+                BackId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,newdata['BackFile'])
+                BackSample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,BackId, 'Sample Parameters'))
+                Profile[5] = BackSample['Scale'][0]*G2frame.PatternTree.GetItemPyData(BackId)[1][1]
+        RefreshPlots(True)
                 
     def OnCopyFlags(event):
@@ -2754 +2762 @@
         finally:
             dlg.Destroy()
-
-        
                 
     def OnFitModelAll(event):
@@ -2818 +2824 @@
                 return
             G2sasd.SizeDistribution(Profile,ProfDict,Limits,Substances,Sample,data)
+            G2plt.PlotSASDSizeDist(G2frame)
             RefreshPlots(True)
             
@@ -2859 +2866 @@
         data['Current'] = fitSel.GetValue()
         wx.CallAfter(UpdateModelsGrid,G2frame,data)
-        
-    def OnValueChange(event):
-        Obj = event.GetEventObject()
-        itemKey,ind,fmt = Indx[Obj.GetId()]
-        try:
-            value = float(Obj.GetValue())
-        except ValueError:
-            value = 0.0
-        Obj.SetValue(fmt%(value))
-        data[itemKey][ind] = value
-        if itemKey == 'Back':
-            Profile[4][:] = value
-        RefreshPlots()
         
     def OnCheckBox(event):
@@ -3231 +3225 @@
         RefreshPlots(True)
         
+    def OnBackChange(event):
+        try:
+            value = float(backVal.GetValue())
+        except ValueError:
+            value = 0.0
+        backVal.SetValue('%.3g'%(value))
+        data['Back'][0] = value
+        Profile[4][:] = value
+        RefreshPlots()
+        
+    def OnBackFile(event):
+        data['BackFile'] = backFile.GetValue()
+        if data['BackFile']:
+            fixBack =  data['Back'][0]
+            BackId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,data['BackFile'])
+            BackSample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,BackId, 'Sample Parameters'))
+            Profile[5] = BackSample['Scale'][0]*G2frame.PatternTree.GetItemPyData(BackId)[1][1]
+            RefreshPlots(True)
+            
     Sample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters'))
     Limits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Limits'))
@@ -3236 +3249 @@
     Substances = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Substances'))
     ProfDict,Profile = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)[:2]
-
+    if data['BackFile']:
+        BackId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,data['BackFile'])
+        BackSample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,BackId, 'Sample Parameters'))
+        Profile[5] = BackSample['Scale'][0]*G2frame.PatternTree.GetItemPyData(BackId)[1][1]
     if G2frame.dataDisplay:
         G2frame.dataFrame.DestroyChildren()
@@ -3279 +3295 @@
     backVal = wx.TextCtrl(G2frame.dataDisplay,value='%.3g'%(data['Back'][0]),style=wx.TE_PROCESS_ENTER)
     Indx[backVal.GetId()] = ['Back',0,'%.3g']
-    backVal.Bind(wx.EVT_TEXT_ENTER,OnValueChange)        
-    backVal.Bind(wx.EVT_KILL_FOCUS,OnValueChange)
+    backVal.Bind(wx.EVT_TEXT_ENTER,OnBackChange)        
+    backVal.Bind(wx.EVT_KILL_FOCUS,OnBackChange)
     backSizer.Add(backVal,0,WACV)
     backVar = wx.CheckBox(G2frame.dataDisplay,label='Refine?')
@@ -3286 +3302 @@
     backVar.SetValue(data['Back'][1])
     backVar.Bind(wx.EVT_CHECKBOX, OnCheckBox)
-    backSizer.Add(backVar,0,WACV)
+    backSizer.Add(backVar,0,WACV)    
+    backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background file: '),0,WACV)
+    Choices = ['',]+G2gd.GetPatternTreeDataNames(G2frame,['SASD',])
+    backFile = wx.ComboBox(parent=G2frame.dataDisplay,value=data['BackFile'],choices=Choices,
+        style=wx.CB_READONLY|wx.CB_DROPDOWN)
+    backFile.Bind(wx.EVT_COMBOBOX,OnBackFile)
+    backSizer.Add(backFile)    
     mainSizer.Add(backSizer)