Changeset 4264 for trunk/GSASIIphsGUI.py

Timestamp:

Jan 23, 2020 10:09:25 AM (22 months ago)

Author:

vondreele

Message:

Add swap atoms to RMCProfile stuff
Handle vacancies

File:

• trunk/GSASIIphsGUI.py (modified) (15 diffs)

trunk/GSASIIphsGUI.py

@@ -1162 +1162 @@
         parent.Raise()
         self.EndModal(wx.ID_OK)
-        
-            
 
 ################################################################################
 #### Phase editing routines
 ################################################################################
+def SetPhaseWindow(phasePage,mainSizer=None,Scroll=0):
+    if mainSizer is not None:
+        phasePage.SetSizer(mainSizer)
+    phasePage.SetAutoLayout(True)
+    phasePage.SetScrollRate(10,10)
+    phasePage.SendSizeEvent()
+    phasePage.Scroll(0,Scroll)
+    
 def GetSpGrpfromUser(parent,SpGrp):
     helptext = '''\t\t\tGSAS-II space group information
@@ -1220 +1226 @@
     return SpcGp
     
-    
-def SetPhaseWindow(phasePage,mainSizer=None,Scroll=0):
-    if mainSizer is not None:
-        phasePage.SetSizer(mainSizer)
-    phasePage.SetAutoLayout(True)
-    phasePage.SetScrollRate(10,10)
-    phasePage.SendSizeEvent()
-    phasePage.Scroll(0,Scroll)
     
 def FindBondsDraw(data):
@@ -2957 +2955 @@
                 return Uij
 
+            SGData = generalData['SGData']
             r,c =  event.GetRow(),event.GetCol()
             replot = True
@@ -2962 +2961 @@
                 ci = colLabels.index('I/A')
                 ID = atomData[r][ci+8]
-                SGData = generalData['SGData']
                 if Atoms.GetColLabelValue(c) in ['x','y','z']:
                     ci = colLabels.index('x')
@@ -3034 +3032 @@
                     DrawAtomsReplaceByID(data['Drawing'],ci+8,atomData[r],ID)
                     G2plt.PlotStructure(G2frame,data)
-                wx.CallAfter(Paint)
+                if SGData['SpGrp'] != 'P 1':    #no need to update P 1 structures!
+                    wx.CallAfter(Paint)
 
         def AtomTypeSelect(event):
@@ -3159 +3158 @@
             for i in range(colU11-1,colU11+6):
                 Atoms.SetColSize(i,50)            
+                attr = wx.grid.GridCellAttr()
+                attr.IncRef()               #fix from Jim Hester
+                attr.SetBackgroundColour(VERY_LIGHT_GREY)
+                attr.SetTextColour(VERY_LIGHT_GREY)
+                attr.SetReadOnly(True)
+                Atoms.SetColAttr(i, attr)
             for row in range(Atoms.GetNumberRows()):    #this is slow for large numbers of atoms
                 atId = atomData[row][colIA+8]
@@ -3183 +3188 @@
                     if 'U' in rbExcl:
                         Atoms.SetCellStyle(row,colUiso,VERY_LIGHT_GREY,True)
-                    for i in range(6):
-                        cj = colU11+i
-                        Atoms.SetCellStyle(row,cj,VERY_LIGHT_GREY,True)
-                        Atoms.SetCellTextColour(row,cj,VERY_LIGHT_GREY)
                 if colM:
                     SytSym,Mul,Nop,dupDir = G2spc.SytSym(atomData[row][colX:colX+3],SGData)
@@ -4465 +4466 @@
                     'material':'nothing','phase':'vacuum','comment':'none ','source':'nowhere'}
                 data['RMC']['RMCProfile'] = {'SuperCell':[1,1,1],'UseSampBrd':[True,True],'aTypes':aTypes,
-                     'atSeq':atSeq,'Pairs':Pairs,'histogram':['',1.0],'files':files,'metadata':metadata,
-                     'runTimes':runTimes,'ReStart':[False,False],'BVS':BVS,'Oxid':atOxid,'useBVS':False,
-                     'AveCN':[],'FxCN':[],'Potentials':{'Angles':[],'Angle search':10.,'Stretch':[],'Stretch search':10.}}
+                    'atSeq':atSeq,'Pairs':Pairs,'histogram':['',1.0],'files':files,'metadata':metadata,
+                    'runTimes':runTimes,'ReStart':[False,False],'BVS':BVS,'Oxid':atOxid,'useBVS':False,'Swaps':[],
+                    'AveCN':[],'FxCN':[],'Potentials':{'Angles':[],'Angle search':10.,'Stretch':[],'Stretch search':10.,
+                    }}
             RMCPdict = data['RMC']['RMCProfile']
 #patches
@@ -4491 +4493 @@
             if 'Potentials' not in RMCPdict:
                 RMCPdict.update({'Potentials':{'Angles':[],'Angle search':10.,'Stretch':[],'Stretch search':10.}})
+            if 'Swaps' not in RMCPdict:
+                RMCPdict['Swaps'] = []
 #end patches
                 
@@ -4527 +4531 @@
             def OnUseBVS(event):
                 RMCPdict['useBVS'] = not RMCPdict['useBVS']
+                wx.CallAfter(UpdateRMC)
+                
+            def OnAddSwap(event):
+                RMCPdict['Swaps'].append(['','',0.0,])
                 wx.CallAfter(UpdateRMC)
                 
@@ -4815 +4823 @@
                 return bondSizer
 
+            def GetSwapSizer():
+    
+                def OnDelSwap(event):
+                    Obj = event.GetEventObject()
+                    swap = Indx[Obj.GetId()]
+                    del RMCPdict['Swaps'][swap]
+                    wx.CallAfter(UpdateRMC)
+                    
+                def OnSwapAtSel(event):
+                    Obj = event.GetEventObject()
+                    swap,i = Indx[Obj.GetId()]
+                    RMCPdict['Swaps'][swap][i] = Obj.GetStringSelection()
+                                           
+                atChoice = RMCPdict['atSeq']
+                swapSizer = wx.FlexGridSizer(4,5,5)
+                swapLabels = [' ','Atom-A','Atom-B',' Swap prob.']
+                for lab in swapLabels:
+                    swapSizer.Add(wx.StaticText(G2frame.FRMC,label=lab),0,WACV)
+                for ifx,swap in enumerate(RMCPdict['Swaps']):
+                    delBtn = wx.Button(G2frame.FRMC,label='Delete')
+                    delBtn.Bind(wx.EVT_BUTTON,OnDelSwap)
+                    Indx[delBtn.GetId()] = ifx
+                    swapSizer.Add(delBtn,0,WACV)
+                    for i in [0,1]:
+                        atmSel = wx.ComboBox(G2frame.FRMC,choices=atChoice,style=wx.CB_DROPDOWN|wx.TE_READONLY)
+                        atmSel.SetStringSelection(swap[i])
+                        atmSel.Bind(wx.EVT_COMBOBOX,OnSwapAtSel)
+                        Indx[atmSel.GetId()] = [ifx,i]
+                        swapSizer.Add(atmSel,0,WACV)
+                    swapSizer.Add(G2G.ValidatedTxtCtrl(G2frame.FRMC,swap,2,min=0.,max=1.,size=(50,25)),0,WACV)
+                return swapSizer
+            
             Indx = {}
 
@@ -4828 +4868 @@
             mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' NB: be sure to set cations first && anions last in atom ordering'),0,WACV)
             mainSizer.Add(GetAtmChoice(),0,WACV)
+            
+            G2G.HorizontalLine(mainSizer,G2frame.FRMC)
+            swapBox = wx.BoxSizer(wx.HORIZONTAL)
+            swapAdd = wx.Button(G2frame.FRMC,label='Add')
+            swapAdd.Bind(wx.EVT_BUTTON,OnAddSwap)
+            swapBox.Add(swapAdd,0,WACV)
+            swapBox.Add(wx.StaticText(G2frame.FRMC,label=' Atom swap probabiities: '),0,WACV)
+            mainSizer.Add(swapBox,0,WACV)        
+            if len(RMCPdict['Swaps']):
+                mainSizer.Add(GetSwapSizer(),0,WACV)            
             
             G2G.HorizontalLine(mainSizer,G2frame.FRMC)
@@ -4996 +5046 @@
             PWId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,RMCPdict['histogram'][0])
             if PWId:
+                reset = False
                 print(G2pwd.MakeInst(G2frame,pName,data,RMCPdict['UseSampBrd'],PWId)+ ' written')
                 backfile = G2pwd.MakeBack(G2frame,pName,PWId)
@@ -5010 +5061 @@
                     if os.path.isfile(pName+'.his6f'):
                         os.remove(pName+'.his6f')
-                    print(G2pwd.MakeRMC6f(G2frame,pName,data,RMCPdict,PWId)+ ' written')
+                    RMC6f,reset = G2pwd.MakeRMC6f(G2frame,pName,data,RMCPdict,PWId)
+                    print(RMC6f+ ' written')
                 print(G2pwd.MakeRMCPdat(G2frame,pName,data,RMCPdict,PWId)+ ' written')
                 print('RMCProfile file build completed')
                 RMCPdict['ReStart'] = [False,False]
+                if reset:
+                    wx.MessageDialog(G2frame,' Vacancies found & "Va" atoms added to list. '+ \
+                        'You may need to revise RMCProfile setup parameters.','Repeat Setup RMC',wx.OK).ShowModal()
+                    wx.CallAfter(UpdateRMC)
             else:
                 print('RMCProfile file build failed - no histogram selected')
@@ -10581 +10637 @@
         print ('clear texture? - does nothing')
 
+###############################################################################
+##### Phase page routines
+###############################################################################
+        
     def FillSelectPageMenu(TabSelectionIdDict, menuBar):
         '''Fill "Select tab" menu with menu items for each tab and assign