Changeset 2874 for trunk

Timestamp:

Jun 24, 2017 9:33:04 AM (6 years ago)

Author:

toby

Message:

Sequential refinement fixes where # of phases change

Location:

trunk

Files:

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

trunk/GSASIImapvars.py

@@ -628 +628 @@
                 msg += _FormatConstraint(constrDict[rel],fixedList[rel])
                 msg += '\nNot used: ' + notused + '\n'
-            if varied > 0 and varied != len(VarKeys(constrDict[rel])):
+            elif varied > 0 and varied != len(VarKeys(constrDict[rel])):
                 msg += "\nNot all variables refined in constraint:\n\t"
                 msg += _FormatConstraint(constrDict[rel],fixedList[rel])
                 msg += '\nNot refined: ' + notvaried + '\n'
     # if there were errors found, go no farther
-    if msg:
+    if msg and SeqHist is not None:
+        print ' *** Sequential refinement: ignoring constraint definition(s): ***'
+        print msg
+        msg = ''
+    elif msg:
         print ' *** ERROR in constraint definitions! ***'
         print msg

trunk/GSASIIstrMain.py

@@ -251 +251 @@
     pIds = []
     for phase in Phases:
+        if histogram not in Phases[phase]['Histograms']: continue
         if Phases[phase]['Histograms'][histogram]['Use']:
             pIds.append(str(Phases[phase]['pId']))