Changeset 3608 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Sep 18, 2018 2:17:01 PM (3 years ago)
Author:
vondreele
Message:

remove 3rd k-vector from Dialog since k-SUBGROUPSMAG doesn't seem to work for 3 k-vectors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r3607 r3608  
    35033503        if len(controls) > 14:
    35043504            testAtoms = ['',]+list(set([atom[1] for atom in controls[14]]))
    3505         kvec = ['0','0','0',' ',' ',' ',' ',' ',' ']
     3505        kvec = ['0','0','0',' ',' ',' ']
    35063506        Kx = [' ','0','1/2','-1/2','1/3','-1/3','2/3','1']
    35073507        Ky = [' ','0','1/2','1/3','2/3','1']
    35083508        Kz = [' ','0','1/2','3/2','1/3','2/3','1']
    35093509        dlg = G2G.MultiDataDialog(G2frame,title='k-SUBGROUPSMAG options',
    3510             prompts=[' kx1 as fr.',' ky1 as fr.',' kz1 as fr.',' kx2 as fr.',' ky2 as fr.',' kz2 as fr.',' kx3 as fr.',' ky3 as fr.',' kz3 as fr.',\
     3510            prompts=[' kx1 as fr.',' ky1 as fr.',' kz1 as fr.',' kx2 as fr.',' ky2 as fr.',' kz2 as fr.',\
    35113511                     ' Use whole star',' Landau transition',' Give intermediate cells','preserve axes','test for mag. atoms','all have moment'],
    35123512            values=kvec+[False,False,False,True,'',False],
    3513             limits=[Kx,Ky,Kz,Kx,Ky,Kz,Kx,Ky,Kz,[True,False],[True,False],[True,False],[True,False],testAtoms,[True,False]],
    3514             formats=['choice','choice','choice','choice','choice','choice','choice','choice','choice','bool','bool','bool','bool',
     3513            limits=[Kx,Ky,Kz,Kx,Ky,Kz,[True,False],[True,False],[True,False],[True,False],testAtoms,[True,False]],
     3514            formats=['choice','choice','choice','choice','choice','choice','bool','bool','bool','bool',
    35153515                     'choice','bool'])
    35163516        if dlg.ShowModal() == wx.ID_OK:
    35173517            magcells = []
    35183518            newVals = dlg.GetValues()
    3519             kvec = newVals[:9]
    3520             star = newVals[9]
    3521             Landau = newVals[10]
    3522             intermed = newVals[11]
    3523             keepaxes = newVals[12]
    3524             atype = newVals[13]
    3525             allmom = newVals[14]
     3519            kvec = newVals[:6]
     3520            star = newVals[6]
     3521            Landau = newVals[7]
     3522            intermed = newVals[8]
     3523            keepaxes = newVals[9]
     3524            atype = newVals[10]
     3525            allmom = newVals[11]
    35263526            magAtms = [atom for atom in controls[14] if atom[1] == atype]
    35273527            wx.BeginBusyCursor()
Note: See TracChangeset for help on using the changeset viewer.