Changeset 3583

Timestamp:

Sep 3, 2018 11:38:48 AM (3 years ago)

Author:

vondreele

Message:

fixes so orthorhombic mag space groups from Bilbao conserve axes - nonstd space groups produced

Location:

trunk

Files:

• GSASIIlattice.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (1 diff)
• GSASIIspc.py (modified) (2 diffs)

trunk/GSASIIlattice.py

@@ -353 +353 @@
     return newPhase,atCodes
     
+def FindNonstandard(Phase):
+    abc = np.eye(3)
+    cba = np.rot90(np.eye(3))
+    cba[0,2] *= -1      #makes -cba
+    Mats = {'abc':abc,'cab':np.roll(abc,2,1),'bca':np.roll(abc,1,1),
+            'acb':np.roll(cba,1,1),'bac':np.roll(cba,2,1),'cba':cba}
+    BNS = {'A':{'abc':'A','cab':'C','bca':'B','acb':'B','bac':'C','cba':'A'},
+           'B':{'abc':'B','cab':'A','bca':'C','acb':'C','bac':'A','cba':'B'},
+           'C':{'abc':'C','cab':'B','bca':'A','acb':'A','bac':'B','cba':'C'},
+           'a':{'abc':'a','cab':'c','bca':'b','acb':'b','bac':'c','cba':'a'},
+           'b':{'abc':'b','cab':'a','bca':'c','acb':'c','bac':'a','cba':'b'},
+           'c':{'abc':'c','cab':'b','bca':'a','acb':'a','bac':'b','cba':'c'},
+           'S':{'abc':'S','cab':'S','bca':'S','acb':'S','bac':'S','cba':'S'},
+           }
+    Fives = {'ababc':'abc','bcbca':'cba'}
+    Trans = Phase['Trans']
+    Uvec = Phase['Uvec']
+    SGData = Phase['SGData']
+    MSG = SGData['MagSpGrp'].split(' ',1)
+    bns = ''
+    if '_' in MSG[0]:
+        bns = MSG[0][2]
+    spn = SGData['SGSpin']
+        
+    
+    if 'ortho' in SGData['SGSys']:
+        transText = G2spc.Trans2Text(nl.inv(Trans))
+        lattSym = ''
+        for fld in transText.split(','):
+            if 'a' in fld: lattSym += 'a'
+            if 'b' in fld: lattSym += 'b'
+            if 'c' in fld: lattSym += 'c'
+        if len(lattSym) == 5:
+            print(transText,lattSym)
+            lattSym = Fives[lattSym]
+#            return None
+        SpGrp = SGData['SpGrp']
+        NUvec = np.inner(np.abs(Mats[lattSym]),Uvec)
+        NTrans = np.inner(Mats[lattSym],Trans.T)
+        spn[1:4] = np.inner(Mats[lattSym],spn[1:4])
+        if SpGrp in G2spc.altSettingOrtho:
+            NSG = G2spc.altSettingOrtho[SpGrp].get(lattSym,SpGrp).replace("'",'').split(' ')
+            Bns = ''
+            if bns:
+                Bns = BNS[bns][lattSym]
+                NSG[0] += '_'+Bns+' '
+            else:
+                for ifld in [1,2,3]:
+                    if spn[ifld] < 0:
+                        NSG[ifld] += "'"
+            Nresult = [''.join(NSG)+'  ',Bns]
+            return Nresult,NUvec,NTrans
+        else:
+            Nresult = [SpGrp,'']
+            return None
+    return None
+        
+def makeBilbaoPhase(result,uvec,trans):
+    phase = {}
+    phase['Name'] = result[0].strip()
+    phase['Uvec'] = uvec
+    phase['Trans'] = trans
+    phase['Keep'] = False
+    phase['Use'] = False
+    SpGp = result[0].replace("'",'')
+    SpGrp = G2spc.StandardizeSpcName(SpGp)
+    phase['SGData'] = G2spc.SpcGroup(SpGrp)[1]
+    phase['SGData']['GenSym'],phase['SGData']['GenFlg'],BNSsym = G2spc.GetGenSym(phase['SGData'])
+    phase['SGData']['MagSpGrp'] = G2spc.MagSGSym(phase['SGData'])
+    phase['SGData']['SGSpin'] = G2spc.GetSGSpin(phase['SGData'],result[0])
+    BNSlatt = phase['SGData']['SGLatt']
+    if result[1]:
+        BNSlatt += '_'+result[1]
+        BNSsym = G2spc.GetGenSym(phase['SGData'])[2]
+        phase['SGData']['BNSlattsym'] = [BNSlatt,BNSsym[BNSlatt]]
+        G2spc.ApplyBNSlatt(phase['SGData'],phase['SGData']['BNSlattsym'])  
+    phase['SGData']['GenSym'],phase['SGData']['GenFlg'],BNSsym = G2spc.GetGenSym(phase['SGData'])
+    phase['SGData']['MagSpGrp'] = G2spc.MagSGSym(phase['SGData'])
+    phase['SGData']['SpnFlp'] = G2spc.GenMagOps(phase['SGData'])[1]
+    return phase
+
 def FillUnitCell(Phase):
     Atoms = copy.deepcopy(Phase['Atoms'])

trunk/GSASIIpwdGUI.py

@@ -3442 +3442 @@
                 if result[0].strip().endswith("1'"):    #skip gray groups
                     continue
-                phase = {}
                 numbs = [eval(item+'.') for item in result[2].split()]
-                phase['Name'] = result[0].strip()
-                phase['Uvec'] = np.array(numbs[3::4])
-                phase['Trans'] = np.array([numbs[:3],numbs[4:7],numbs[8:11]]).T         #Bilbao gives transpose
-                phase['Cell'] = G2lat.TransformCell(controls[6:12],phase['Trans'])   
-                phase['Keep'] = False
-                phase['Use'] = False
-                SpGp = result[0].replace("'",'')
-                SpGrp = G2spc.StandardizeSpcName(SpGp)
-                phase['SGData'] = G2spc.SpcGroup(SpGrp)[1]
-                phase['SGData']['GenSym'],phase['SGData']['GenFlg'],BNSsym = G2spc.GetGenSym(phase['SGData'])
-                phase['SGData']['MagSpGrp'] = G2spc.MagSGSym(phase['SGData'])
-                phase['BNSlatt'] = phase['SGData']['SGLatt']
-                if result[1]:
-                    phase['BNSlatt'] += '_'+result[1]
-                    BNSsym = G2spc.GetGenSym(phase['SGData'])[2]
-                    phase['SGData']['BNSlattsym'] = [phase['BNSlatt'],BNSsym[phase['BNSlatt']]]
-                    G2spc.ApplyBNSlatt(phase['SGData'],phase['SGData']['BNSlattsym'])  
-                phase['SGData']['GenSym'],phase['SGData']['GenFlg'],BNSsym = G2spc.GetGenSym(phase['SGData'])
-                phase['SGData']['MagSpGrp'] = G2spc.MagSGSym(phase['SGData'])
-                phase['SGData']['SpnFlp'] = G2spc.GenMagOps(phase['SGData'])[1]
-                magcells.append(phase)
+                Uvec = np.array(numbs[3::4])
+                Trans = np.array([numbs[:3],numbs[4:7],numbs[8:11]]).T         #Bilbao gives transpose
+                phase = G2lat.makeBilbaoPhase(result[:2],Uvec,Trans)
+                phase['Cell'] = G2lat.TransformCell(controls[6:12],Trans)   
+                RVT = G2lat.FindNonstandard(phase)
+                if RVT is None:
+                    magcells.append(phase)
+                else:
+#                    magcells.append(phase)          #temporary??
+                    Nresult,NUvec,NTrans = RVT
+                    newphase = G2lat.makeBilbaoPhase(Nresult,NUvec,NTrans)
+                    newphase['Cell'] = G2lat.TransformCell(controls[6:12],NTrans)   
+                    magcells.append(newphase)
             magcells[0]['Use'] = True
             SGData = magcells[0]['SGData']

trunk/GSASIIspc.py

@@ -1234 +1234 @@
                 Spn.append(1)
                 iB = jF+1
-    SGData['SGSpin'] = Spn
+    return Spn
             
 def GenMagOps(SGData):
@@ -3620 +3620 @@
 ''' A dictionary of alternate settings for orthorhombic unit cells
 '''
-altSettingsOrtho = {
+altSettingOrtho = {
         'P 2 2 21' :{'abc':'P 2 2 21','cab':'P 21 2 2','bca':'P 2 21 2','acb':'P 2 21 2','bac':'P 2 2 21','cba':'P 21 2 2'},
         'P 21 21 2':{'abc':'P 2121 2','cab':'P 2 21 21','bca':'P 21 2 21','acb':'P 21 2 21','bac':'P 21 21 2','cba':'P 2 21 21'},