Changeset 1676 for trunk/GSASIImapvars.py

Timestamp:

Feb 27, 2015 9:46:37 PM (9 years ago)

Author:

toby

Message:

Ignore equivalences that are not in use; start on svn switch implementation for help

File:

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

trunk/GSASIImapvars.py

@@ -570 +570 @@
                     if notvaried: notvaried += ', '
                     notvaried += mv
-                if mv not in indepVarList: indepVarList.append(mv)
                 if parmDict is not None and mv not in parmDict:
-                    msg += "\nCannot equivalence to variable "+str(mv)+". Not defined in this refinement"
-                    continue
+                    print "Dropping equivalence for variable "+str(mv)+". Not defined in this refinement"
+                    #msg += "\nCannot equivalence to variable "+str(mv)+". Not defined in this refinement"
+                    #continue
+                else: 
+                    if mv not in indepVarList: indepVarList.append(mv)
                 for v,m in zip(varlist,invmultarr):
                     if parmDict is not None and v not in parmDict:
@@ -873 +875 @@
     for varlist,mapvars,invmultarr in zip(dependentParmList,indParmList,invarrayList):
         #if invmultarr is None: continue # probably not needed
-        valuelist = [parmDict[var] for var in mapvars]
+        try: 
+            valuelist = [parmDict[var] for var in mapvars]
+        except KeyError:
+            continue
         # get the v-covar matrix for independent parameters 
         vcov = np.zeros((len(mapvars),len(mapvars)))
@@ -1066 +1071 @@
     for varlist,mapvars,invmultarr in zip(dependentParmList,indParmList,invarrayList):
         #if invmultarr is None: continue
-        valuelist = [parmDict[var] for var in mapvars]
+        try: 
+            valuelist = [parmDict[var] for var in mapvars]
+        except KeyError:
+            continue
         parmDict.update(zip(varlist,
                             np.dot(invmultarr,np.array(valuelist)))