Changeset 926


Ignore:
Timestamp:
May 20, 2013 10:39:07 AM (9 years ago)
Author:
vondreele
Message:

split GSASIIstruct.py into 3 pieces

Location:
trunk
Files:
3 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r906 r926  
    7070import GSASIIpwdGUI as G2pdG
    7171import GSASIIspc as G2spc
    72 import GSASIIstruct as G2str
     72import GSASIIstrMain as G2stMn
     73import GSASIIstrIO as G2stIO
    7374import GSASIImapvars as G2mv
    7475import GSASIIsolve as G2sol
     
    23042305        rigidbodyDict = self.PatternTree.GetItemPyData(   
    23052306            G2gd.GetPatternTreeItemId(self,self.root,'Rigid bodies'))
    2306         rbVary,rbDict = G2str.GetRigidBodyModels(rigidbodyDict,Print=False)
     2307        rbVary,rbDict = G2stIO.GetRigidBodyModels(rigidbodyDict,Print=False)
    23072308        rbIds = rigidbodyDict.get('RBIds',{'Vector':[],'Residue':[]})
    2308         Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2str.GetPhaseData(Phases,RestraintDict=None,rbIds=rbIds,Print=False)       
    2309         hapVary,hapDict,controlDict = G2str.GetHistogramPhaseData(Phases,Histograms,Print=False)
    2310         histVary,histDict,controlDict = G2str.GetHistogramData(Histograms,Print=False)
     2309        Natoms,atomIndx,phaseVary,phaseDict,pawleyLookup,FFtable,BLtable = G2stIO.GetPhaseData(Phases,RestraintDict=None,rbIds=rbIds,Print=False)       
     2310        hapVary,hapDict,controlDict = G2stIO.GetHistogramPhaseData(Phases,Histograms,Print=False)
     2311        histVary,histDict,controlDict = G2stIO.GetHistogramData(Histograms,Print=False)
    23112312        varyList = rbVary+phaseVary+hapVary+histVary
    23122313        parmDict.update(rbDict)
     
    23382339        self.OnFileSave(event)
    23392340        # check that constraints are OK here
    2340         errmsg, warnmsg = G2str.CheckConstraints(self.GSASprojectfile)
     2341        errmsg, warnmsg = G2stIO.CheckConstraints(self.GSASprojectfile)
    23412342        if errmsg:
    23422343            print('Error in constraints:\n'+errmsg+
     
    23642365        Rw = 100.00
    23652366        try:
    2366             Rw = G2str.Refine(self.GSASprojectfile,dlg)
     2367            Rw = G2stMn.Refine(self.GSASprojectfile,dlg)
    23672368        finally:
    23682369            dlg.Destroy()
     
    24102411        self.OnFileSave(event)
    24112412        # check that constraints are OK here
    2412         errmsg, warnmsg = G2str.CheckConstraints(self.GSASprojectfile)
     2413        errmsg, warnmsg = G2stIO.CheckConstraints(self.GSASprojectfile)
    24132414        if errmsg:
    24142415            print('Error in constraints:\n'+errmsg+
     
    24332434        dlg.SetSize(Size)
    24342435        try:
    2435             G2str.SeqRefine(self.GSASprojectfile,dlg)
     2436            G2stMn.SeqRefine(self.GSASprojectfile,dlg)
    24362437        finally:
    24372438            dlg.Destroy()       
  • trunk/testDeriv.py

    r918 r926  
    126126        Size[1] = max(Size[1],290) + 35
    127127        self.testDerivPanel.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
     128        print Size
    128129        self.testDerivPanel.SetSize(Size)
    129130
Note: See TracChangeset for help on using the changeset viewer.