Changeset 1238

Timestamp:

Mar 5, 2014 9:59:35 PM (9 years ago)

Author:

toby

Message:

improve seq. ref. error msg; add debug printing

File:

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

trunk/GSASIIstrMain.py

@@ -284 +284 @@
                 newVaryList[i] = item
             if newVaryList != SeqResult['varyList']:
-                print newVaryList
-                print SeqResult['varyList']
+                #print 'histogram',histogram,len(newVaryList),'variables'
+                #print newVaryList
+                #print 'previous',len(SeqResult['varyList']),'variables'
+                #print SeqResult['varyList']
                 print '**** ERROR - variable list for this histogram does not match previous'
+                print '\ncurrent histogram',histogram,'has',len(newVaryList),'variables'
+                combined = list(set(SeqResult['varyList']+newVaryList))
+                c = [var for var in combined if var not in newVaryList]
+                p = [var for var in combined if var not in SeqResult['varyList']]
+                line = 'Variables in previous but not in current: '
+                if c:
+                    for var in c:
+                        if len(line) > 100:
+                            print line
+                            line = '    '
+                        line += var + ', '
+                else:
+                    line += 'none'
+                print line
+                print '\nPrevious refinement has',len(SeqResult['varyList']),'variables'
+                line = 'Variables in current but not in previous: '
+                if p:
+                    for var in p:
+                        if len(line) > 100:
+                            print line
+                            line = '    '
+                        line += var + ', '
+                else:
+                    line += 'none'
+                print line
                 raise Exception
         parmDict.update(phaseDict)
@@ -308 +335 @@
         #print G2mv.VarRemapShow(varyList)
         G2mv.Map2Dict(parmDict,varyList)
+        print 'parmDict:',parmDict ######### show dict just before refinement
         Rvals = {}
         while True: