Changeset 3057 for trunk/GSASIImapvars.py

Timestamp:

Sep 8, 2017 5:56:57 PM (4 years ago)

Author:

toby

Message:

more work on constraints: prevent use of perviously constrained variables in new equivalences; include sym. generated constraints in checks; do not allow error-generating constraints to be added

File:

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

trunk/GSASIImapvars.py

@@ -235 +235 @@
 symGenList = [] # Flag if constraint is generated by symmetry
 problemVars = [] # variables causing errors
+dependentVars = []
+independentVars = []
 
 # prefix for parameter names
@@ -520 +522 @@
                 errmsg += _FormatConstraint(constrDict[rel],fixedList[rel])
                 errmsg += "\n"
+    _setVarLists([])
     return errmsg,warnmsg
 
@@ -765 +768 @@
         if fixedval:
             fixedDict[fixedval] = float(fixedval)
-
-    # make list of dependent and independent variables (after dropping unused)
+    _setVarLists(dropVarList)
+    
+def _setVarLists(dropVarList):
+    '''Make list of dependent and independent variables (after dropping unused vars in dropVarList)
+    '''
+    global dependentParmList,indParmList
     global dependentVars
     global independentVars