Changeset 3234 for trunk/testSSymbols.py

Timestamp:

Jan 19, 2018 12:11:54 PM (5 years ago)

Author:

vondreele

Message:

new G2spc.SSChoice routine finds all allowed super space group symbols for a given space group.
Installed to drive ss symbol choices. Simplifies SSpcGroup.
Fix python 3 bug in covariance plot routine

File:

• trunk/testSSymbols.py (modified) (3 diffs)

trunk/testSSymbols.py

@@ -53 +53 @@
         
         def OnExhaustive(event):
-            laue = Data['SGData']['SGLaue']
-            good = []
-            if laue in ['2/m','mmm']:
-                SSList = []
-                for ax in laueSS[laue]:
-                    for sx in laueTS[laue]:
-                        SSList.append(ax+sx)                
-            else:
-                latt = Data['SGData']['SGLatt']+Data['SGData']['SGPtGrp']
-                SSList = G2spc.ptssdict.get(latt,['',])
-            for SSymbol in SSList:
-                E,SSGData = G2spc.SSpcGroup(Data['SGData'],SSymbol)
-                if SSGData:
-                    good.append(SSymbol)
-                    text,table = G2spc.SSGPrint(Data['SGData'],SSGData)
-                    Data['SSGData'] = SSGData
-                    Data['SuperSg'] = SSymbol
-                    msg = 'Superspace Group Information'
-#                    G2G.SGMessageBox(self,msg,text,table).Show()
-#                else:
-#                    msg = 'Superspace Group Error for'+SSymbol
-#                    Style = wx.ICON_EXCLAMATION
-#                    Text = '\n'+E
-#                    wx.MessageBox(Text,caption=msg,style=Style)
-            print(good)           
+            SSList = G2spc.SSChoice(Data['SGData'])
+            print(SSList)           
         
         def OnSpaceGroup(event):
@@ -103 +80 @@
                 msg = 'Space Group Information'
                 G2G.SGMessageBox(self,msg,text,table).Show()
-            latt = Data['SGData']['SGLatt']+Data['SGData']['SGPtGrp']
-            SSChoice = G2spc.ptssdict.get(latt,['',])
+            SSChoice = G2spc.SSChoice(Data['SGData'])
             Data['SuperSg'] = SSChoice[0]
             self.UpdateData(Data)
@@ -143 +119 @@
         mainSizer.Add(SGTxt,0,WACV)
         mainSizer.Add(wx.StaticText(self.testSSPanel,label=' Superspace group: '+Data['SGData']['SpGrp']),0,WACV)
-        latt = Data['SGData']['SGLatt']+Data['SGData']['SGPtGrp']
-        SSChoice = G2spc.ptssdict.get(latt,['',])
-        ssChoice = []
-        for item in SSChoice:
-            E,SSG = G2spc.SSpcGroup(SGData,item)
-            if SSG: ssChoice.append(item)
+        ssChoice = G2spc.SSChoice(Data['SGData'])
         if ssChoice:
             superGp = wx.ComboBox(self.testSSPanel,value=Data['SuperSg'],choices=ssChoice,style=wx.CB_DROPDOWN)   #wx.CB_READONLY|