Changeset 4063

Timestamp:

Jul 15, 2019 3:14:18 PM (2 years ago)

Author:

vondreele

Message:

fix triclinic indexing
change "Load cell from phase" to "Load Phase"

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (10 diffs)

trunk/GSASIIdataGUI.py

@@ -5350 +5350 @@
             'Run Bilboa "Lattice Symmetry" to find higher symmetry cells')
         self.RunSubGroups = self.IndexEdit.Append(G2G.wxID_RUNSUB,'Run SUBGROUPS',
-            'If disabled, do Load Cell first')
+            'If disabled, do Load Phase first')
         self.RunSubGroupsMag = self.IndexEdit.Append(G2G.wxID_RUNSUBMAG,'Run k-SUBGROUPMAG',
-            'If disabled, do Load Cell first')
+            'If disabled, do Load Phase first')
         self.CopyCell = self.IndexEdit.Append(G2G.wxID_COPYCELL,'Copy Cell', 
             'Copy selected unit cell from indexing to cell refinement fields')
-        self.LoadCell = self.IndexEdit.Append(G2G.wxID_LOADCELL,'Load Cell from phase', 
+        self.LoadCell = self.IndexEdit.Append(G2G.wxID_LOADCELL,'Load Phase', 
             'Load unit cell from a phase tree entry')
         self.ImportCell = self.IndexEdit.Append(G2G.wxID_IMPORTCELL,'Import Cell', 

trunk/GSASIIpwdGUI.py

@@ -3037 +3037 @@
     SPGlist = G2spc.spglist
     bravaisSymb = ['Fm3m','Im3m','Pm3m','R3-H','P6/mmm','I4/mmm','P4/mmm',
-        'Fmmm','Immm','Ammm','Bmmm','Cmmm','Pmmm','I2/m','C2/m','P2/m','C1','P1']
+        'Fmmm','Immm','Ammm','Bmmm','Cmmm','Pmmm','I2/m','C2/m','P2/m','P1','C1']
     spaceGroups = ['F m 3 m','I m 3 m','P m 3 m','R 3 m','P 6/m m m','I 4/m m m',
-        'P 4/m m m','F m m m','I m m m','A m m m','B m m m','C m m m','P m m m','I 2/m','C 2/m','P 2/m','C -1','P -1']
+        'P 4/m m m','F m m m','I m m m','A m m m','B m m m','C m m m','P m m m','I 2/m','C 2/m','P 2/m','P -1','C -1']
     Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]
     Limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits'))[1]
     if 'C' in Inst['Type'][0] or 'PKS' in Inst['Type'][0]:
         wave = G2mth.getWave(Inst)
-#        dmin = max(1.0,G2lat.Pos2dsp(Inst,Limits[1]))
         dmin = G2lat.Pos2dsp(Inst,Limits[1])
     else:
         difC = Inst['difC'][1]
-#        dmin = max(1.0,G2lat.Pos2dsp(Inst,Limits[0]))
         dmin = G2lat.Pos2dsp(Inst,Limits[0])
     
@@ -3065 +3063 @@
         elif controls[5] in ['C2/m','P2/m','I2/m']:
             controls[9] = controls[11] = 90.  # b unique
-#        if len(controls) < 13: controls.append(0)
         controls[12] = G2lat.calc_V(G2lat.cell2A(controls[6:12]))
         return ibrav
@@ -3086 +3083 @@
         if controls[5] in ['Fm3m','Im3m','Pm3m']:
             SSopt.SetValue(False)
-            G2frame.ErrorDialog('Cubic lattice',
-                                'Incommensurate superlattice not possible with a cubic lattice')
+            G2frame.ErrorDialog('Cubic lattice','Incommensurate superlattice not possible with a cubic lattice')
             return
         ssopt['Use'] = SSopt.GetValue()
@@ -3231 +3227 @@
         inc = float(shiftChoices[shiftSel.GetSelection()][:-1])
         move = Obj.GetValue()  # +1 or -1 
-#        if ObjId//2 >= 3: # angle movements could be bigger
-#            move *= 2
         Obj.SetValue(0)
         value = float(valObj.GetValue()) * (1. + move*inc/100.)
@@ -3627 +3621 @@
         
     KeyList = []
+    
     def ClearCurrentShowNext():
         KeepShowNext(False)
+        
     KeyList += [['j',ClearCurrentShowNext,'Show next Mag. Spc. Group, clear keep flag on current']]        
+    
     def KeepCurrentShowNext():
         KeepShowNext(True)
-    KeyList += [['k',KeepCurrentShowNext,'Show next Mag. Spc. Group, keep current']]        
+        
+    KeyList += [['k',KeepCurrentShowNext,'Show next Mag. Spc. Group, keep current']]
+        
     def KeepShowNext(KeepCurrent=True):
         '''Show next "keep" item in Magnetic Space Group list, possibly resetting the 
@@ -3934 +3933 @@
         wx.EndBusyCursor()
         if not page: return
-        while cells: cells.pop() # cells.clear() is much cleaner but not Py2
+#        while cells: cells.pop() # cells.clear() is much cleaner but not Py2
         for i,(cell,mat) in enumerate(kSUB.parseBilbaoCheckLattice(page)):
             cells.append([])
@@ -4176 +4175 @@
     if len(controls) < 15:
         controls.append(list(range(1,len(magcells)+1)))
-    if len(bravais) < 16:
-        bravais += [0,0,]
-    if len(bravais) < 17:
+    while len(bravais) < 17:
         bravais += [0,]
     SGData = ssopt.get('SGData',G2spc.SpcGroup(controls[13])[1])
@@ -4185 +4182 @@
         'Tetragonal-I','Tetragonal-P','Orthorhombic-F','Orthorhombic-I','Orthorhombic-A',
         'Orthorhombic-B','Orthorhombic-C','Orthorhombic-P',
-        'Monoclinic-I','Monoclinic-C','Monoclinic-P','Triclinic','Triclinic']
+        'Monoclinic-I','Monoclinic-C','Monoclinic-P','Triclinic','Triclinic',]
     cellGUIlist = [[[0,1,2],4,zip([" Unit cell: a = "," Vol = "],[(10,5),"%.3f"],[True,False],[0,0])],
     [[3,4,5,6],6,zip([" Unit cell: a = "," c = "," Vol = "],[(10,5),(10,5),"%.3f"],[True,True,False],[0,2,0])],
@@ -4260 +4257 @@
     mainSizer.Add((5,5),0)
     littleSizer = wx.BoxSizer(wx.HORIZONTAL)
-    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label="Bravais\nlattice",style=wx.ALIGN_CENTER),0,WACV,5)
+    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=" Bravais  \n lattice ",style=wx.ALIGN_CENTER),0,WACV,5)
     bravSel = wx.Choice(G2frame.dataWindow,choices=bravaisSymb,size=(75,-1))
     bravSel.SetSelection(bravaisSymb.index(controls[5]))
     bravSel.Bind(wx.EVT_CHOICE,OnBravSel)
     littleSizer.Add(bravSel,0,WACV)
-    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label="Space\ngroup",style=wx.ALIGN_CENTER),0,WACV,5)
+    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=" Space  \n group  ",style=wx.ALIGN_CENTER),0,WACV,5)
     spcSel = wx.Choice(G2frame.dataWindow,choices=SPGlist[controls[5]],size=(75,-1))
     spcSel.SetSelection(SPGlist[controls[5]].index(controls[13]))
@@ -4273 +4270 @@
         controls[0] = False
     else:
-        littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=" Zero offset"),0,WACV)
+        littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=" Zero offset "),0,WACV)
         zero = G2G.ValidatedTxtCtrl(G2frame.dataWindow,controls,1,nDig=(10,4),typeHint=float,
                                     min=-5.,max=5.,size=(50,-1))