Changeset 2156


Ignore:
Timestamp:
Feb 23, 2016 11:15:25 AM (6 years ago)
Author:
vondreele
Message:

one more ':' to ';'
remove Sample displ x & y from TOF

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r2151 r2156  
    101101    if 'PWDR' in histName:
    102102        if dataType == 'Debye-Scherrer':
    103             parms += [['DisplaceX',u'Sample X displ. perp. to beam (\xb5m): ',[10,3]],
    104                 ['DisplaceY',u'Sample Y displ. || to beam (\xb5m): ',[10,3]],
    105                 ['Absorption',u'Sample absorption (\xb5\xb7r): ',[10,4]],]
    106103            if 'T' in histType:
    107                 parms[-1] = ['Absorption',u'Sample absorption (\xb5\xb7r/l): ',[10,4]]
     104                parms += [['Absorption',u'Sample absorption (\xb5\xb7r/l): ',[10,4]],]
     105            else:
     106                parms += [['DisplaceX',u'Sample X displ. perp. to beam (\xb5m): ',[10,3]],
     107                    ['DisplaceY',u'Sample Y displ. || to beam (\xb5m): ',[10,3]],
     108                    ['Absorption',u'Sample absorption (\xb5\xb7r): ',[10,4]],]
    108109        elif dataType == 'Bragg-Brentano':
    109110            parms += [['Shift',u'Sample displacement(\xb5m): ',[10,4]],
  • trunk/GSASIIstrIO.py

    r2155 r2156  
    25642564                        Nterms = len(hapData[item][4])
    25652565                        for i in range(Nterms):
    2566                             sfx = ':'+str(i)
     2566                            sfx = ';'+str(i)
    25672567                            hapData[item][4][i] = parmDict[pfx+item+sfx]
    25682568                            if pfx+item+sfx in sigDict:
Note: See TracChangeset for help on using the changeset viewer.