Changeset 3461 for trunk/GSASIIobj.py

Timestamp:

Jul 4, 2018 8:35:03 PM (5 years ago)

Author:

toby

Message:

Add CheckAllScalePhaseFractions? to add constraint when all phase fractions are varied; Py3 fixes for seq fit equations; on update, save only when needed

File:

• trunk/GSASIIobj.py (modified) (2 diffs)

trunk/GSASIIobj.py

@@ -2355 +2355 @@
             if not self.freeVars[v][2]: continue
             if "::"+self.freeVars[v][0] not in varyList: continue
-            indx = varyList.index("::"+self.freeVars[v][0])
+            indx = list(varyList).index("::"+self.freeVars[v][0])
             self.freeVars[v][1] = values[indx]
 
@@ -2375 +2375 @@
         exprLblList,fxnpkgdict = ret
         # check each var used in expression is defined
-        defined = self.assgnVars.keys() + self.freeVars.keys()
+        defined = list(self.assgnVars.keys()) + list(self.freeVars.keys())
         notfound = []
         for var in exprLblList: