Changeset 4534 for trunk/GSASIIpy3.py


Ignore:
Timestamp:
Jul 27, 2020 10:42:49 PM (15 months ago)
Author:
toby
Message:

implement variable limits; show cell under Dij vals

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpy3.py

    r3825 r4534  
    1717sqrt = sq = lambda x: np.sqrt(x)
    1818pi = np.pi
     19
     20# formatting for unique cell parameters by Laue type
     21cellGUIlist = [[['m3','m3m'],4,[" Unit cell: a = "],["{:.5f}"],[True],[0]],
     22[['3R','3mR'],6,[" a = ",u" \u03B1 = "],["{:.5f}","{:.3f}"],[True,True],[0,3]],
     23[['3','3m1','31m','6/m','6/mmm','4/m','4/mmm'],6,[" a = "," c = "],["{:.5f}","{:.5f}"],[True,True],[0,2]],
     24[['mmm'],8,[" a = "," b = "," c = "],["{:.5f}","{:.5f}","{:.5f}"],
     25    [True,True,True],[0,1,2]],
     26[['2/m'+'a'],10,[" a = "," b = "," c = ",u" \u03B1 = "],
     27    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,3]],
     28[['2/m'+'b'],10,[" a = "," b = "," c = ",u" \u03B2 = "],
     29    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,4]],
     30[['2/m'+'c'],10,[" a = "," b = "," c = ",u" \u03B3 = "],
     31    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,5]],
     32[['-1'],7,[" a = "," b = "," c = ",u" \u03B1 = ",u" \u03B2 = ",u" \u03B3 = "],
     33    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}","{:.3f}","{:.3f}"],
     34    [True,True,True,False,True,True,True],[0,1,2,3,4,5]]]
    1935
    2036def FormulaEval(string):
     
    88104        if ':' in string: # deal with weird bug where a colon pops up in a number when formatting (EPD 7.3.2!)
    89105            string = str(val)
    90         if digits[1] > 0: # strip off extra zeros on right side
     106        if digits[1] > 0 and not 'e' in string.lower(): # strip off extra zeros on right side
    91107            string = string.rstrip('0')
    92108            if string[-1] == '.': string += "0"
Note: See TracChangeset for help on using the changeset viewer.