Changeset 3711 for trunk/testDeriv.py


Ignore:
Timestamp:
Oct 29, 2018 4:10:08 PM (3 years ago)
Author:
toby
Message:

major constraint update: move conflicting equivs to constraints; allow a formula for multiplier; update docs extensively. New routine EvaluateMultipliers? needed to evaluate formulae

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/testDeriv.py

    r3415 r3711  
    131131        self.delt = [max(abs(self.parmDict[name])*0.0001,1e-6) for name in self.varylist+self.depVarList]
    132132        file.close()
    133         groups,parmlist = G2mv.GroupConstraints(self.constrDict)
    134         G2mv.GenerateConstraints(groups,parmlist,self.varylist,self.constrDict,self.fixedList,self.parmDict)
     133        msg = G2mv.EvaluateMultipliers(self.constrDict,self.parmDict)
     134        if msg:
     135            print('Unable to interpret multiplier(s): '+msg)
     136            raise Exception
     137        G2mv.GenerateConstraints(self.varylist,self.constrDict,self.fixedList,self.parmDict)
    135138        print(G2mv.VarRemapShow(self.varylist))
    136139        print('Dependent Vary List:',self.depVarList)
Note: See TracChangeset for help on using the changeset viewer.