Ignore:
Timestamp:
May 20, 2013 11:06:42 AM (9 years ago)
Author:
vondreele
Message:

more G2str fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIconstrGUI.py

    r923 r927  
    2727import GSASIIElem as G2elem
    2828import GSASIIElemGUI as G2elemGUI
    29 import GSASIIstruct as G2str
     29import GSASIIstrIO as G2stIO
    3030import GSASIImapvars as G2mv
    3131import GSASIIgrid as G2gd
     
    112112        G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))
    113113    rbIds = rigidbodyDict.get('RBIds',{'Vector':[],'Residue':[]})
    114     rbVary,rbDict = G2str.GetRigidBodyModels(rigidbodyDict,Print=False)
     114    rbVary,rbDict = G2stIO.GetRigidBodyModels(rigidbodyDict,Print=False)
    115115    globalList = rbDict.keys()
    116116    globalList.sort()
    117117    AtomDict = dict([Phases[phase]['pId'],Phases[phase]['Atoms']] for phase in Phases)
    118     Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2str.GetPhaseData(Phases,rbIds=rbIds,Print=False)
     118    Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2stIO.GetPhaseData(Phases,rbIds=rbIds,Print=False)
    119119    phaseList = []
    120120    for item in phaseDict:
     
    137137            phaseAtTypes[item] = ''
    138138           
    139     hapVary,hapDict,controlDict = G2str.GetHistogramPhaseData(Phases,Histograms,Print=False)
     139    hapVary,hapDict,controlDict = G2stIO.GetHistogramPhaseData(Phases,Histograms,Print=False)
    140140    hapList = hapDict.keys()
    141141    hapList.sort()
    142     histVary,histDict,controlDict = G2str.GetHistogramData(Histograms,Print=False)
     142    histVary,histDict,controlDict = G2stIO.GetHistogramData(Histograms,Print=False)
    143143    histList = []
    144144    for item in histDict:
     
    280280        if not len(allcons): return True
    281281        G2mv.InitVars()   
    282         constDictList,fixedList,ignored = G2str.ProcessConstraints(allcons)
     282        constDictList,fixedList,ignored = G2stIO.ProcessConstraints(allcons)
    283283        errmsg, warnmsg = G2mv.CheckConstraints('',constDictList,fixedList)
    284284        if errmsg:
     
    305305        if not len(allcons): return True
    306306        G2mv.InitVars()   
    307         constDictList,fixedList,ignored = G2str.ProcessConstraints(allcons)
     307        constDictList,fixedList,ignored = G2stIO.ProcessConstraints(allcons)
    308308        errmsg, warnmsg = G2mv.CheckConstraints('',constDictList,fixedList)
    309309        if errmsg:
Note: See TracChangeset for help on using the changeset viewer.