Changeset 1547 for trunk/GSASIIphsGUI.py


Ignore:
Timestamp:
Oct 29, 2014 6:56:39 AM (8 years ago)
Author:
vondreele
Message:

change "Crystal size" to "Domain size"
use lookups for allowed super symmetries for GSAS-II standard space groups as used in the indexing routine.
supersymmetry for trigonal/rhomahedral & hexagonal all complete & checked
supersylmmetry for monoclinic & tetragonal all complete but get errors
orthorhombic not done yet
min Nc/No? set to 2 (at 1 it failed) for indexing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r1545 r1547  
    231231                    if generalData['Type'] in ['modulated',]:
    232232                        generalData['SuperSg'] = SetDefaultSSsymbol()
     233                        generalData['SSGData'] = G2spc.SSpcGroup(generalData['SGData'],generalData['SuperSg'])[1]
    233234                    wx.CallAfter(UpdateGeneral)
    234235                else:
     
    259260                if generalData['Type'] in ['modulated',]:
    260261                    generalData['SuperSg'] = SetDefaultSSsymbol()
     262                    generalData['SSGData'] = G2spc.SSpcGroup(generalData['SGData'],generalData['SuperSg'])[1]
    261263                wx.CallAfter(UpdateGeneral)
    262264               
     
    589591            dimSizer.Add(dim,0,WACV)
    590592            dimSizer.Add(wx.StaticText(General,label=' Superspace group: '+generalData['SGData']['SpGrp']),0,WACV)
    591             superGp = wx.TextCtrl(General,value=generalData['SuperSg'],style=wx.TE_PROCESS_ENTER)
    592             superGp.Bind(wx.EVT_TEXT_ENTER,OnSuperGp)       
     593            SSChoice = G2spc.ssdict.get(generalData['SGData']['SpGrp'],[])
     594            if SSChoice:
     595                superGp = wx.ComboBox(General,value=generalData['SuperSg'],choices=SSChoice,style=wx.CB_READONLY|wx.CB_DROPDOWN)
     596                superGp.Bind(wx.EVT_COMBOBOX,OnSuperGp)
     597            else:   #nonstandard space group symbol not in my dictionary
     598                superGp = wx.TextCtrl(General,value=generalData['SuperSg'],style=wx.TE_PROCESS_ENTER)
     599                superGp.Bind(wx.EVT_TEXT_ENTER,OnSuperGp)                       
    593600            dimSizer.Add(superGp,0,WACV)
    594601            modSizer.Add(dimSizer)
Note: See TracChangeset for help on using the changeset viewer.