Changeset 4536

Timestamp:

Aug 2, 2020 8:16:06 AM (3 years ago)

Author:

vondreele

Message:

supply missing default pink derivatives
fix "Bravais lattice" issues in Unit Cells List

Location:

trunk

Files:

• GSASIIpwd.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIpwd.py

@@ -1545 +1545 @@
                 if alpName in varyList:
                     alp = parmDict[alpName]
+                    dada0 = dada1 = 0.0
                 else:
                     alp = G2mth.getPinkalpha(parmDict,tth)
@@ -1552 +1553 @@
                 if betName in varyList:
                     bet = parmDict[betName]
+                    dbdb0 = dbdb1 = 0.0
                 else:
                     bet = G2mth.getPinkbeta(parmDict,tth)

trunk/GSASIIpwdGUI.py

@@ -3556 +3556 @@
         controls[5] = (SGData['SGLatt']+SGData['SGLaue']).replace('-','')
         if controls[5][1:] == 'm3': controls[5] += 'm'
-        if 'P3' in controls[5] or 'P-3' in controls[5]: controls[5] = 'P6/mmm'
+        if controls[5] in ['P3','P3m1','P31m','P6/m']: controls[5] = 'P6/mmm'
+        if controls[5] in ['P4/m',]: controls[5] = 'P4/mmm'
         if 'R' in controls[5]: controls[5] = 'R3-H'
         controls[6:13] = Cell[1:8]
@@ -3564 +3565 @@
             if not ssopt.get('Use',False):
                 G2frame.dataWindow.RunSubGroupsMag.Enable(True)
-#                G2frame.dataWindow.RunSubGroups.Enable(True)
         data = controls,bravais,cells,dminx,ssopt,magcells
         G2frame.GPXtree.SetItemPyData(UnitCellsId,data)