Changeset 1247 for trunk/GSASIImapvars.py

Timestamp:

Mar 12, 2014 3:46:47 PM (9 years ago)

Author:

toby

Message:

allow wildcarded-histogram constraint input; implement for seq refinements

File:

• trunk/GSASIImapvars.py (modified) (5 diffs)

trunk/GSASIImapvars.py

@@ -416 +416 @@
             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 += "\nVariable "+str(var)+" does not begin with a ':'"
                 if var in varyList:
@@ -511 +511 @@
     return errmsg,warnmsg
 
-def GenerateConstraints(groups,parmlist,varyList,constrDict,fixedList,parmDict=None):
+def GenerateConstraints(groups,parmlist,varyList,constrDict,fixedList,parmDict=None,SeqHist=None):
     '''Takes a list of relationship entries comprising a group of
     constraints and builds the relationship lists and their inverse
@@ -535 +535 @@
       floats, float values or None if the constraint defines a new parameter.
       
-    :param dict constrDict: a list of dicts defining relationships/constraints.
-
+    :param dict parmDict: a dict containing all parameters defined in current
+      refinement.
+
+    :param int SeqHist: number of current histogram, when used in a sequential
+      refinement. None (default) otherwise. Wildcard variable names are
+      set to the current histogram, when found if not None.
     '''
     global dependentParmList,arrayList,invarrayList,indParmList,consNum
@@ -630 +634 @@
             for var in constrDict[rel]:
                 if var.startswith('_'): continue
+                if var.split(':')[1] == '*' and SeqHist is not None:
+                    # convert wildcard var to current histogram
+                    sv = var.split(':')
+                    sv[1] = str(SeqHist)
+                    var = ':'.join(sv)
                 if parmDict is not None and var not in parmDict:
                     unused += 1
@@ -673 +682 @@
             unused = 0
             for var in VarKeys(constrDict[rel]):
+                if var.split(':')[1] == '*' and SeqHist is not None:
+                    # convert wildcard var to current histogram
+                    sv = var.split(':')
+                    sv[1] = str(SeqHist)
+                    var = ':'.join(sv)
                 if parmDict is not None and var not in parmDict:
                     unused += 1