Changeset 927 for trunk/GSASIIconstrGUI.py
- Timestamp:
- May 20, 2013 11:06:42 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIconstrGUI.py
r923 r927 27 27 import GSASIIElem as G2elem 28 28 import GSASIIElemGUI as G2elemGUI 29 import GSASIIstr uct as G2str29 import GSASIIstrIO as G2stIO 30 30 import GSASIImapvars as G2mv 31 31 import GSASIIgrid as G2gd … … 112 112 G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'Rigid bodies')) 113 113 rbIds = rigidbodyDict.get('RBIds',{'Vector':[],'Residue':[]}) 114 rbVary,rbDict = G2st r.GetRigidBodyModels(rigidbodyDict,Print=False)114 rbVary,rbDict = G2stIO.GetRigidBodyModels(rigidbodyDict,Print=False) 115 115 globalList = rbDict.keys() 116 116 globalList.sort() 117 117 AtomDict = dict([Phases[phase]['pId'],Phases[phase]['Atoms']] for phase in Phases) 118 Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2st r.GetPhaseData(Phases,rbIds=rbIds,Print=False)118 Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2stIO.GetPhaseData(Phases,rbIds=rbIds,Print=False) 119 119 phaseList = [] 120 120 for item in phaseDict: … … 137 137 phaseAtTypes[item] = '' 138 138 139 hapVary,hapDict,controlDict = G2st r.GetHistogramPhaseData(Phases,Histograms,Print=False)139 hapVary,hapDict,controlDict = G2stIO.GetHistogramPhaseData(Phases,Histograms,Print=False) 140 140 hapList = hapDict.keys() 141 141 hapList.sort() 142 histVary,histDict,controlDict = G2st r.GetHistogramData(Histograms,Print=False)142 histVary,histDict,controlDict = G2stIO.GetHistogramData(Histograms,Print=False) 143 143 histList = [] 144 144 for item in histDict: … … 280 280 if not len(allcons): return True 281 281 G2mv.InitVars() 282 constDictList,fixedList,ignored = G2st r.ProcessConstraints(allcons)282 constDictList,fixedList,ignored = G2stIO.ProcessConstraints(allcons) 283 283 errmsg, warnmsg = G2mv.CheckConstraints('',constDictList,fixedList) 284 284 if errmsg: … … 305 305 if not len(allcons): return True 306 306 G2mv.InitVars() 307 constDictList,fixedList,ignored = G2st r.ProcessConstraints(allcons)307 constDictList,fixedList,ignored = G2stIO.ProcessConstraints(allcons) 308 308 errmsg, warnmsg = G2mv.CheckConstraints('',constDictList,fixedList) 309 309 if errmsg:
Note: See TracChangeset
for help on using the changeset viewer.