Changeset 3713


Ignore:
Timestamp:
Oct 30, 2018 11:53:13 PM (3 years ago)
Author:
toby
Message:

constraint bug fix; comments

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImapvars.py

    r3711 r3713  
    4949to the start of the refinement. In a formula, GSAS-II parameters will be replaced by the
    5050value of the parameter before the formula is evaluated, so ``'np.cos(0::Ax:2)'`` is a valid
    51 multiplier.
     51multiplier. At present, only phase (atom/cell) parameters are available for use in
     52a formula, but this can be expanded if needed.
    5253
    5354This type of constraint describes an alternate
     
    7778to the start of the refinement. In a formula, GSAS-II parameters will be replaced by the
    7879value of the parameter before the formula is evaluated, so ``'np.cos(0::Ax:2)'`` is a valid
    79 multiplier.
     80multiplier. At present, only phase (atom/cell) parameters are available for use in
     81a formula, but this can be expanded if needed.
    8082
    8183These equations set an interdependence between variables.
     
    107109the refinement. In a formula, GSAS-II parameters will be replaced by the value of the
    108110parameter before the formula is evaluate, so ``'np.cos(0::Ax:2)'`` is a valid multiplier.
    109 
     111At present, only phase (atom/cell) parameters are available for use in
     112a formula, but this can be expanded if needed.
    110113Note that
    111114the latter constraint expression is conceptually identical to
     
    437440
    438441:func:`EvaluateMultipliers`
    439    Convert any string-specified multipliers to numbers. Call this before
     442   Convert any string-specified (formula-based) multipliers to numbers. Call this before
    440443   using :func:`CheckConstraints` or :func:`GenerateConstraints`.
     444   At present, the code may pass only the dict for phase (atom/cell) parameters,
     445   but this could be expanded if needed.
    441446
    442447:func:`Map2Dict`
  • trunk/GSASIIstrIO.py

    r3711 r3713  
    209209    histVary,histDict,controlDict = GetHistogramData(Histograms,Print=False)
    210210    varyList = rbVary+phaseVary+hapVary+histVary
    211     msg = G2mv.EvaluateMultipliers(constDict,phaseDict,hapDict,histDict)
     211    msg = G2mv.EvaluateMultipliers(constrDict,phaseDict,hapDict,histDict)
    212212    if msg:
    213213        return 'Unable to interpret multiplier(s): '+msg,''
Note: See TracChangeset for help on using the changeset viewer.