Changeset 1835 for trunk/testDeriv.py

Timestamp:

May 4, 2015 4:44:41 PM (8 years ago)

Author:

vondreele

Message:

fix problem with deleting/inserting data into phases
fix plot problem from Ddata
fix problem with testDeriv & constraints

File:

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

trunk/testDeriv.py

@@ -95 +95 @@
                 self.values = cPickle.load(file)
                 self.HistoPhases = cPickle.load(file)
-                (G2mv.dependentParmList,G2mv.arrayList,G2mv.invarrayList,G2mv.indParmList,
-                    G2mv.invarrayList) = cPickle.load(file)
+                (self.constrDict,self.fixedList) = cPickle.load(file)
                 self.parmDict = cPickle.load(file)
                 self.varylist = cPickle.load(file)
@@ -104 +103 @@
                 self.delt = [max(abs(self.parmDict[name])*0.001,1e-6) for name in self.varylist]
                 file.close()
+                groups,parmlist = G2mv.GroupConstraints(self.constrDict)
+                G2mv.GenerateConstraints(groups,parmlist,self.varylist,self.constrDict,self.fixedList,self.parmDict)
                 self.UpdateControls(event)
                 print G2mv.VarRemapShow(self.varylist)