Changeset 4852 for trunk


Ignore:
Timestamp:
Mar 12, 2021 12:35:11 PM (7 months ago)
Author:
vondreele
Message:

clarify text about constraints in ShowLSParms
put a wx.Raise in for ErrorDialog?
double up a '\' in G2mapvars
cosmetics in the code for G2strIO & Math

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIctrlGUI.py

    r4844 r4852  
    41044104        refChoices = ['All','Refined']
    41054105        txt = ('"R" indicates a refined variable\n'+
    4106                '"C" indicates generated from a constraint')
     4106               '"C" indicates generated from a user entered constraint')
    41074107        if fcount:
    41084108            refChoices += ['Frozen']
  • trunk/GSASIIdataGUI.py

    r4850 r4852  
    55155515        if parent is None:
    55165516            dlg = wx.MessageDialog(self, message, title,  wtype)
     5517            dlg.Raise()
    55175518        else:
    55185519            dlg = wx.MessageDialog(parent, message, title,  wtype)
  • trunk/GSASIImapvars.py

    r4851 r4852  
    699699            for var in constrDict[rel]:
    700700                if var.startswith('_'): continue
    701                 if not re.match('[0-9]*:[0-9\*]*:',var):
     701                if not re.match('[0-9]*:[0-9\\*]*:',var):
    702702                    warnmsg += "\nParameter "+str(var)+" does not begin with a ':'"
    703703                if var in varyList:
     
    15801580            if not symFlag: continue
    15811581            if multarr is None:
    1582                 #s1 = str(mv) + ' = '
    15831582                s1 = ''
    15841583                s2 = ' = ' + str(mv)
  • trunk/GSASIIstrIO.py

    r4849 r4852  
    175175    If the constraint cannot be used due to too many dropped variables,
    176176    it is counted as ignored.
     177    NB: this processing does not include symmetry imposed constraints
    177178   
    178179    :param list constList: a list of lists where each item in the outer list
  • trunk/GSASIIstrMath.py

    r4840 r4852  
    749749    ast = np.sqrt(np.diag(G))
    750750    Mast = twopisq*np.multiply.outer(ast,ast)
    751     SGMT = np.array([ops[0].T for ops in SGData['SGOps']])
     751    SGMT = np.array([ops[0].T for ops in SGData['SGOps']])      #### ops[0].T
    752752    SGT = np.array([ops[1] for ops in SGData['SGOps']])
    753753    FFtables = calcControls['FFtables']
     
    875875    ast = np.sqrt(np.diag(G))
    876876    Mast = twopisq*np.multiply.outer(ast,ast)
    877     SGMT = np.array([ops[0].T for ops in SGData['SGOps']])
     877    SGMT = np.array([ops[0].T for ops in SGData['SGOps']])    #### ops[0].T?
    878878    SGT = np.array([ops[1] for ops in SGData['SGOps']])
    879879    FFtables = calcControls['FFtables']
     
    34573457    for j in dependentVars:
    34583458        depDerivDict[j] = np.zeros(shape=(len(x)))
    3459 #    print 'dependent vars',dependentVars
     3459#    print ('dependent vars',dependentVars)
    34603460    hId = Histogram['hId']
    34613461    hfx = ':%d:'%(hId)
Note: See TracChangeset for help on using the changeset viewer.