Changeset 2186


Ignore:
Timestamp:
Mar 31, 2016 9:50:12 AM (6 years ago)
Author:
vondreele
Message:

fix Bravais lattice name issues in Unit Cells & fix problem of uneditable unit cell values after Show HKLs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r2158 r2186  
    24792479            controls[7] = controls[8] = controls[6]
    24802480            controls[9] = controls[10] = controls[11] = 90.
    2481         elif controls[5] in ['R 3 m','P 6/m m m','I 4/m m m','P 4/m m m']:
     2481        elif controls[5] in ['R3m','P6/mmm','I4/mmm','P4/mmm']:
    24822482            controls[7] = controls[6]
    24832483            controls[9] = controls[10] = controls[11] = 90.
    24842484            if controls[5] in ['R3-H','P6/mmm']:
    24852485                controls[11] = 120.
    2486         elif controls[5] in ['F m m m','I m m m','C m m m','P m m m']:
     2486        elif controls[5] in ['Fmmm','Immm','Cmmm','Pmmm']:
    24872487            controls[9] = controls[10] = controls[11] = 90.
    2488         elif controls[5] in ['C 2/m','P 2/m']:
     2488        elif controls[5] in ['C2/m','P2/m']:
    24892489            controls[9] = controls[11] = 90.  # b unique
    24902490        if len(controls) < 13: controls.append(0)
     
    26122612            if controls[5] in ['R3-H','P6/mmm']:
    26132613                controls[11] = 120.
    2614         elif controls[5] in ['F m m m','I m m m','C m m m','P m m m']:
     2614        elif controls[5] in ['Fmmm','Immm','Cmmm','Pmmm']:
    26152615            controls[6+ObjId] = value
    26162616            Obj.SetValue("%.5f"%(controls[6+ObjId]))
    26172617            controls[9] = controls[10] = controls[11] = 90.0
    2618         elif controls[5] in ['C 2/m','P 2/m']:
     2618        elif controls[5] in ['C2/m','P2/m']:
    26192619            controls[9] = controls[11] = 90.0
    26202620            if ObjId != 3:
     
    26752675                value = 90.
    26762676        SetCellValue(Obj,ObjId/2,value)
     2677        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
    26772678       
    26782679    def OnHklShow(event):
     
    27512752            elif ibrav in ['R3-H','P6/mmm','I4/mmm','P4/mmm']:
    27522753                print " %s%10.6f %s%10.6f %s%12.3f" % ('a =',cell[0],' c =',cell[2],' volume =',Vol)
    2753             elif ibrav in ['P 4/m m m','F m m m','I m m m','C m m m','P m m m']:
     2754            elif ibrav in ['P4/mmm','Fmmm','Immm','Cmmm','Pmmm']:
    27542755                print " %s%10.6f %s%10.6f %s%10.6f %s%12.3f" % ('a =',cell[0],'b =',cell[1],'c =',cell[2],' volume =',Vol)
    2755             elif ibrav in ['C 2/m','P 2/m']:
     2756            elif ibrav in ['C2/m','P2/m']:
    27562757                print " %s%10.6f %s%10.6f %s%10.6f %s%8.3f %s%12.3f" % ('a =',cell[0],'b =',cell[1],'c =',cell[2],'beta =',cell[4],' volume =',Vol)
    27572758            else:
Note: See TracChangeset for help on using the changeset viewer.