Changeset 1502

Timestamp:

Sep 18, 2014 11:18:32 AM (9 years ago)

Author:

toby

Message:

Fix problem with constraint editing of floats converted to strings

Location:

trunk

Files:

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

trunk/GSASIIgrid.py

@@ -340 +340 @@
         elif self.type is float:
             try:
-                float(val)
+                val = float(val) # convert strings, if needed
             except:
                 if self.CIFinput and (val == '?' or val == '.'):

trunk/GSASIImapvars.py

@@ -526 +526 @@
 
     :param list varyList: a list of parameters names (strings of form
-      ``<ph>:<hst>:<nam>``) that will be varied
+      ``<ph>:<hst>:<nam>``) that will be varied. Note that this is changed here. 
     
     :param dict constrDict: a list of dicts defining relationships/constraints
@@ -794 +794 @@
             var,mult = var
         else:
-            raise Exception, "Cannot parse "+repr(var) + " as var or (var,multiplier)"
+            raise Exception("Cannot parse "+repr(var) + " as var or (var,multiplier)")
         mapList.append(var)
         multlist.append(tuple((mult,)))