Changeset 4852 for trunk

Timestamp:

Mar 12, 2021 12:35:11 PM (2 years 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:

• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIImapvars.py (modified) (2 diffs)
• GSASIIstrIO.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (3 diffs)

trunk/GSASIIctrlGUI.py

@@ -4104 +4104 @@
         refChoices = ['All','Refined']
         txt = ('"R" indicates a refined variable\n'+
-               '"C" indicates generated from a constraint')
+               '"C" indicates generated from a user entered constraint')
         if fcount:
             refChoices += ['Frozen']

trunk/GSASIIdataGUI.py

@@ -5515 +5515 @@
         if parent is None:
             dlg = wx.MessageDialog(self, message, title,  wtype)
+            dlg.Raise()
         else:
             dlg = wx.MessageDialog(parent, message, title,  wtype)

trunk/GSASIImapvars.py

@@ -699 +699 @@
             for var in constrDict[rel]:
                 if var.startswith('_'): continue
-                if not re.match('[0-9]*:[0-9\*]*:',var):
+                if not re.match('[0-9]*:[0-9\\*]*:',var):
                     warnmsg += "\nParameter "+str(var)+" does not begin with a ':'"
                 if var in varyList:
@@ -1580 +1580 @@
             if not symFlag: continue
             if multarr is None:
-                #s1 = str(mv) + ' = '
                 s1 = ''
                 s2 = ' = ' + str(mv)

trunk/GSASIIstrIO.py

@@ -175 +175 @@
     If the constraint cannot be used due to too many dropped variables,
     it is counted as ignored.
+    NB: this processing does not include symmetry imposed constraints
     
     :param list constList: a list of lists where each item in the outer list

trunk/GSASIIstrMath.py

@@ -749 +749 @@
     ast = np.sqrt(np.diag(G))
     Mast = twopisq*np.multiply.outer(ast,ast)
-    SGMT = np.array([ops[0].T for ops in SGData['SGOps']])
+    SGMT = np.array([ops[0].T for ops in SGData['SGOps']])      #### ops[0].T
     SGT = np.array([ops[1] for ops in SGData['SGOps']])
     FFtables = calcControls['FFtables']
@@ -875 +875 @@
     ast = np.sqrt(np.diag(G))
     Mast = twopisq*np.multiply.outer(ast,ast)
-    SGMT = np.array([ops[0].T for ops in SGData['SGOps']])
+    SGMT = np.array([ops[0].T for ops in SGData['SGOps']])    #### ops[0].T?
     SGT = np.array([ops[1] for ops in SGData['SGOps']])
     FFtables = calcControls['FFtables']
@@ -3457 +3457 @@
     for j in dependentVars:
         depDerivDict[j] = np.zeros(shape=(len(x)))
-#    print 'dependent vars',dependentVars
+#    print ('dependent vars',dependentVars)
     hId = Histogram['hId']
     hfx = ':%d:'%(hId)