Changeset 1835 for trunk/testDeriv.py


Ignore:
Timestamp:
May 4, 2015 4:44:41 PM (6 years ago)
Author:
vondreele
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/testDeriv.py

    r1493 r1835  
    9595                self.values = cPickle.load(file)
    9696                self.HistoPhases = cPickle.load(file)
    97                 (G2mv.dependentParmList,G2mv.arrayList,G2mv.invarrayList,G2mv.indParmList,
    98                     G2mv.invarrayList) = cPickle.load(file)
     97                (self.constrDict,self.fixedList) = cPickle.load(file)
    9998                self.parmDict = cPickle.load(file)
    10099                self.varylist = cPickle.load(file)
     
    104103                self.delt = [max(abs(self.parmDict[name])*0.001,1e-6) for name in self.varylist]
    105104                file.close()
     105                groups,parmlist = G2mv.GroupConstraints(self.constrDict)
     106                G2mv.GenerateConstraints(groups,parmlist,self.varylist,self.constrDict,self.fixedList,self.parmDict)
    106107                self.UpdateControls(event)
    107108                print G2mv.VarRemapShow(self.varylist)
Note: See TracChangeset for help on using the changeset viewer.