Changeset 2323


Ignore:
Timestamp:
Jun 15, 2016 7:20:50 PM (5 years ago)
Author:
toby
Message:

prepare to calc s.u. for distance pseudo vars

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2321 r2323  
    14621462        self.SequentialMenu.Append(menu=self.SequentialPvars, title='Pseudo Vars')
    14631463        self.SequentialPvars.Append(
    1464             id=wxADDSEQVAR, kind=wx.ITEM_NORMAL,text='Add',
    1465             help='Add a new pseudo-variable')
     1464            id=wxADDSEQVAR, kind=wx.ITEM_NORMAL,text='Add Formula',
     1465            help='Add a new custom pseudo-variable')
    14661466        self.SequentialPvars.Append(
    14671467            id=wxADDSEQDIST, kind=wx.ITEM_NORMAL,text='Add Distance',
     
    34413441            calcobj.UpdateDict(PSvarDict)
    34423442            valList.append(calcobj.EvalExpression())
     3443            # if calcobj.su is not None: esdList[-1] = calcobj.su
    34433444        if not esdList:
    34443445            esdList = None
  • trunk/GSASIIobj.py

    r2318 r2323  
    16611661        (list of 1-3 str values)'''
    16621662
    1663         self.distance_stuff = None  # to be used for defining atom distances
     1663        self.distance_dict  = None  # to be used for defining atom phase/symmetry info
    16641664        self.distance_atoms = None  # to be used for defining atom distances
    16651665
     
    19381938        not evaluation of expression.)
    19391939        '''
     1940        self.su = None
     1941        '''Standard error evaluation where supplied by the evaluator
     1942        '''
    19401943        # Patch: for old-style expressions with a (now removed step size)
    19411944        for v in self.eObj.assgnVars:
     
    20412044        then the result will be ``4.0``.
    20422045        '''
     2046        self.su = None
    20432047        if self.eObj.expression.startswith('Dist'):
    20442048            dist = 0
    20452049#            GSASIIpath.IPyBreak()
    20462050            dist = G2mth.CalcDist(self.eObj.distance_dict, self.eObj.distance_atoms, self.parmDict)
    2047             return dist
     2051            #self.su = G2mth.CalcDistSu(self.eObj.distance_dict, self.eObj.distance_atoms, self.parmDict)
     2052            return dist
    20482053        if self.compiledExpr is None:
    20492054            raise Exception,"EvalExpression called before SetupCalc"
Note: See TracChangeset for help on using the changeset viewer.