Changeset 4851 for trunk

Timestamp:

Mar 11, 2021 8:35:23 PM (2 years ago)

Author:

toby

Message:

reformat equivalence pairs as Bob prefers

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (1 diff)
• GSASIImapvars.py (modified) (1 diff)

trunk/GSASIIconstrGUI.py

@@ -1154 +1154 @@
                     typeString = 'CONST'
                     eqString[-1] += ' = '+str(item[-3])
+                elif item[-1] == 'e' and len(item[:-3]) == 2:
+                    if item[0][0] == 0: item[0][0] = 1.0
+                    if item[1][0] == 0: item[1][0] = 1.0
+                    var = str(item[0][1])
+                    helptext = 'Variable {:} '.format(var) + " ("+ G2obj.fmtVarDescr(var) + ")"
+                    helptext += "\n\nis equivalent to "
+                    m = item[0][0]/item[1][0]
+                    var1 = str(item[1][1])
+                    helptext += '\n{:3g} * {:} '.format(m,var1) + " ("+ G2obj.fmtVarDescr(var1) + ")"
+                    eqString[-1] += '{:} = {:}'.format(var1,var)
+                    if m != 1:
+                        eqString[-1] += ' / ' + str(m)
+                    typeString = 'EQUIV'
                 elif item[-1] == 'e':
                     helptext = "The following variable:"
-                    normval = item[:-3][0][0]
-                    indepterm = item[:-3][0][1]
+                    normval = item[0][0]
+                    indepterm = item[0][1]
                     for i,term in enumerate(item[:-3]):
                         var = str(term[1])

trunk/GSASIImapvars.py

@@ -1584 +1584 @@
                 s2 = ' = ' + str(mv)
                 j = 0
+                if len(varlist) == 1:
+                    # format the way Bob prefers
+                    if invmultarr[0][0] == 1: 
+                        s1 = str(varlist[0]) + ' = ' + str(mv)
+                    else:
+                        s1 = str(varlist[0]) + ' = ' + str(
+                            invmultarr[0][0]) + ' * '+ str(mv)
+                    symout.append(s1)
+                    continue
                 for v,m in zip(varlist,invmultarr):
                     if debug: print ('v,m[0]: ',v,m[0])