Changeset 2501 for trunk/testDeriv.py

Timestamp:

Oct 22, 2016 1:21:40 PM (7 years ago)

Author:

vondreele

Message:

fix (again!) mag moment drawings
clean up testDeriv

File:

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

trunk/testDeriv.py

@@ -178 +178 @@
                 if name in self.varylist:
                     self.values[self.varylist.index(name)] -= delt
-                else:
+                    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
+                else:   #in depVarList
                     self.parmDict[name] -= delt
-                M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
-                    varyList,self.calcControls,self.pawleyLookup,None)
-                if name in self.varylist:
-                    self.values[self.varylist.index(name)] += 2.*delt
-                else:
+                    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)
-                if name in self.varylist:
-                    self.values[self.varylist.index(name)] -= delt
-                else:
+                    M1 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
+                        varyList,self.calcControls,self.pawleyLookup,None)
                     self.parmDict[name] -= delt    
                 Mn = (M1-M0)/(2.*delt)
@@ -200 +200 @@
         while self.plotNB.nb.GetPageCount():
             self.plotNB.nb.DeletePage(0)
+        test1()
         for use,name,delt in zip(self.use,self.varylist+self.depVarList,self.delt):
             if use: