Changeset 2539 for trunk/testDeriv.py

Timestamp:

Nov 21, 2016 11:13:37 AM (6 years ago)

Author:

vondreele

Message:

fix to unicode character in directory name problem
numerous unused parameters removed - more to come

File:

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

trunk/testDeriv.py

@@ -20 +20 @@
 '''
 
-import os
-import os.path as ospath
 import sys
 import time
@@ -27 +25 @@
 import wx
 import numpy as np
-import matplotlib as mpl
 import GSASIIpath
 import GSASIIstrMath as G2stMth
@@ -173 +170 @@
             M2 = dMdV[varyList.index(name)]
             hplot.plot(M2,'b',label='analytic deriv')
-            if name in varyList:
-                mmin = np.min(dMdV[varyList.index(name)])
-                mmax = np.max(dMdV[varyList.index(name)])
-                print 'parameter:',name,self.parmDict[name],delt,mmin,mmax
-                if name in self.varylist:
-                    self.values[self.varylist.index(name)] -= delt
-                    M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
-                        varyList,self.calcControls,self.pawleyLookup,None)
-                    self.values[self.varylist.index(name)] += 2.*delt
-                    M1 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
-                        varyList,self.calcControls,self.pawleyLookup,None)
-                    self.values[self.varylist.index(name)] -= delt
-                elif name in self.depVarList:   #in depVarList
-                    if 'dA' in name:
-                        name = name.replace('dA','A')
-                        delt *= -1
-                    self.parmDict[name] -= delt
-                    M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
-                        varyList,self.calcControls,self.pawleyLookup,None)
-                    self.parmDict[name] += 2.*delt
-                    M1 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
-                        varyList,self.calcControls,self.pawleyLookup,None)
-                    self.parmDict[name] -= delt    
-                Mn = (M1-M0)/(2.*abs(delt))
-                hplot.plot(Mn,'r',label='numeric deriv')
-                hplot.plot(M2-Mn,'g',label='diff')
+            mmin = np.min(dMdV[varyList.index(name)])
+            mmax = np.max(dMdV[varyList.index(name)])
+            print 'parameter:',name,self.parmDict[name],delt,mmin,mmax
+            if name in self.varylist:
+                self.values[self.varylist.index(name)] -= delt
+                M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
+                    varyList,self.calcControls,self.pawleyLookup,None)
+                self.values[self.varylist.index(name)] += 2.*delt
+                M1 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
+                    varyList,self.calcControls,self.pawleyLookup,None)
+                self.values[self.varylist.index(name)] -= delt
+            elif name in self.depVarList:   #in depVarList
+                if 'dA' in name:
+                    name = name.replace('dA','A')
+                    delt *= -1
+                self.parmDict[name] -= delt
+                M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
+                    varyList,self.calcControls,self.pawleyLookup,None)
+                self.parmDict[name] += 2.*delt
+                M1 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
+                    varyList,self.calcControls,self.pawleyLookup,None)
+                self.parmDict[name] -= delt    
+            Mn = (M1-M0)/(2.*abs(delt))
+            hplot.plot(Mn,'r',label='numeric deriv')
+            hplot.plot(M2-Mn,'g',label='diff')
 #            GSASIIpath.IPyBreak()
             hplot.legend(loc='best')