Changeset 927 for trunk/testDeriv.py


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

more G2str fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/testDeriv.py

    r926 r927  
    1010import matplotlib as mpl
    1111import GSASIIpath
    12 import GSASIIstruct as G2st
     12import GSASIIstrMath as G2stMth
    1313import GSASIItestplot as plot
    1414import pytexture as ptx
     
    133133        def test1():
    134134            fplot = self.plotNB.add('function test').gca()
    135             M = G2st.errRefine(self.values,self.HistoPhases,
     135            M = G2stMth.errRefine(self.values,self.HistoPhases,
    136136                self.parmDict,self.varylist,self.calcControls,
    137137                self.pawleyLookup,None)
     
    141141        def test2(name,delt):
    142142            hplot = self.plotNB.add('derivatives test for '+name).gca()
    143             dMdV = G2st.dervRefine(self.values,self.HistoPhases,self.parmDict,
     143            dMdV = G2stMth.dervRefine(self.values,self.HistoPhases,self.parmDict,
    144144                self.varylist,self.calcControls,self.pawleyLookup,None)
    145145            hplot.plot(dMdV[self.varylist.index(name)],'b',label='analytic deriv')
    146146            if name in self.varylist:
    147147                self.values[self.varylist.index(name)] -= delt
    148                 M0 = G2st.errRefine(self.values,self.HistoPhases,self.parmDict,
     148                M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
    149149                    self.varylist,self.calcControls,self.pawleyLookup,None)
    150150                self.values[self.varylist.index(name)] += 2.*delt
    151                 M1 = G2st.errRefine(self.values,self.HistoPhases,self.parmDict,
     151                M1 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
    152152                    self.varylist,self.calcControls,self.pawleyLookup,None)
    153153                self.values[self.varylist.index(name)] -= delt   
Note: See TracChangeset for help on using the changeset viewer.