Changeset 927 for trunk/testDeriv.py

Timestamp:

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

Author:

vondreele

Message:

more G2str fixes

File:

• trunk/testDeriv.py (modified) (3 diffs)

trunk/testDeriv.py

@@ -10 +10 @@
 import matplotlib as mpl
 import GSASIIpath
-import GSASIIstruct as G2st
+import GSASIIstrMath as G2stMth
 import GSASIItestplot as plot
 import pytexture as ptx
@@ -133 +133 @@
         def test1():
             fplot = self.plotNB.add('function test').gca()
-            M = G2st.errRefine(self.values,self.HistoPhases,
+            M = G2stMth.errRefine(self.values,self.HistoPhases,
                 self.parmDict,self.varylist,self.calcControls,
                 self.pawleyLookup,None)
@@ -141 +141 @@
         def test2(name,delt):
             hplot = self.plotNB.add('derivatives test for '+name).gca()
-            dMdV = G2st.dervRefine(self.values,self.HistoPhases,self.parmDict,
+            dMdV = G2stMth.dervRefine(self.values,self.HistoPhases,self.parmDict,
                 self.varylist,self.calcControls,self.pawleyLookup,None)
             hplot.plot(dMdV[self.varylist.index(name)],'b',label='analytic deriv')
             if name in self.varylist:
                 self.values[self.varylist.index(name)] -= delt
-                M0 = G2st.errRefine(self.values,self.HistoPhases,self.parmDict,
+                M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
                     self.varylist,self.calcControls,self.pawleyLookup,None)
                 self.values[self.varylist.index(name)] += 2.*delt
-                M1 = G2st.errRefine(self.values,self.HistoPhases,self.parmDict,
+                M1 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
                     self.varylist,self.calcControls,self.pawleyLookup,None)
                 self.values[self.varylist.index(name)] -= delt