Changeset 1818

Timestamp:

Apr 28, 2015 2:49:55 PM (8 years ago)

Author:

toby

Message:

fix immediate constraint problem; need to double check on skipped constraints

Location:

trunk

Files:

• GSASIImapvars.py (modified) (2 diffs)
• GSASIIstrMain.py (modified) (1 diff)

trunk/GSASIImapvars.py

@@ -600 +600 @@
                 msg += str(mv) + " => " + s + '\n'
     # save the lists of dep. and indep. vars (after dropping unused)
-    global dependentVars,independentVars
-    dependentVars = depVarList
+    global independentVars
     independentVars = indepVarList
+    #print 'independentVars=',independentVars
     equivVarList = list(set(indepVarList).union(set(depVarList)))
 
@@ -746 +746 @@
             fixedDict[fixedval] = float(fixedval)
 
+    # make list of dependent variables
+    global dependentVars
+    depVarList = []
+    for varlist,mapvars,invmultarr in zip(       # process equivalences
+        dependentParmList,indParmList,invarrayList):
+        for i,mv in enumerate(varlist):
+            if mv not in depVarList: depVarList.append(mv)
+    dependentVars = depVarList
     if debug: # on debug, show what is parsed & generated, semi-readable
         print 50*'-'

trunk/GSASIIstrMain.py

@@ -178 +178 @@
         groups,parmlist = G2mv.GroupConstraints(constrDict)
         G2mv.GenerateConstraints(groups,parmlist,varyList,constrDict,fixedList,parmDict)
+        #print G2mv.VarRemapShow(varyList)
     except:
         print ' *** ERROR - your constraints are internally inconsistent ***'