Changeset 927 for trunk/GSASIIconstrGUI.py

Timestamp:

May 20, 2013 11:06:42 AM (10 years ago)

Author:

vondreele

Message:

more G2str fixes

File:

• trunk/GSASIIconstrGUI.py (modified) (5 diffs)

trunk/GSASIIconstrGUI.py

@@ -27 +27 @@
 import GSASIIElem as G2elem
 import GSASIIElemGUI as G2elemGUI
-import GSASIIstruct as G2str
+import GSASIIstrIO as G2stIO
 import GSASIImapvars as G2mv
 import GSASIIgrid as G2gd
@@ -112 +112 @@
         G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))
     rbIds = rigidbodyDict.get('RBIds',{'Vector':[],'Residue':[]})
-    rbVary,rbDict = G2str.GetRigidBodyModels(rigidbodyDict,Print=False)
+    rbVary,rbDict = G2stIO.GetRigidBodyModels(rigidbodyDict,Print=False)
     globalList = rbDict.keys()
     globalList.sort()
     AtomDict = dict([Phases[phase]['pId'],Phases[phase]['Atoms']] for phase in Phases)
-    Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2str.GetPhaseData(Phases,rbIds=rbIds,Print=False)
+    Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2stIO.GetPhaseData(Phases,rbIds=rbIds,Print=False)
     phaseList = []
     for item in phaseDict:
@@ -137 +137 @@
             phaseAtTypes[item] = ''
             
-    hapVary,hapDict,controlDict = G2str.GetHistogramPhaseData(Phases,Histograms,Print=False)
+    hapVary,hapDict,controlDict = G2stIO.GetHistogramPhaseData(Phases,Histograms,Print=False)
     hapList = hapDict.keys()
     hapList.sort()
-    histVary,histDict,controlDict = G2str.GetHistogramData(Histograms,Print=False)
+    histVary,histDict,controlDict = G2stIO.GetHistogramData(Histograms,Print=False)
     histList = []
     for item in histDict:
@@ -280 +280 @@
         if not len(allcons): return True
         G2mv.InitVars()    
-        constDictList,fixedList,ignored = G2str.ProcessConstraints(allcons)
+        constDictList,fixedList,ignored = G2stIO.ProcessConstraints(allcons)
         errmsg, warnmsg = G2mv.CheckConstraints('',constDictList,fixedList)
         if errmsg:
@@ -305 +305 @@
         if not len(allcons): return True
         G2mv.InitVars()    
-        constDictList,fixedList,ignored = G2str.ProcessConstraints(allcons)
+        constDictList,fixedList,ignored = G2stIO.ProcessConstraints(allcons)
         errmsg, warnmsg = G2mv.CheckConstraints('',constDictList,fixedList)
         if errmsg: