Changeset 1289

Timestamp:

Apr 19, 2014 6:37:07 PM (9 years ago)

Author:

toby

Message:

Fix bug in copy of histogram parms on Copy Next

File:

• trunk/GSASIIstrMain.py (modified) (1 diff)

trunk/GSASIIstrMain.py

@@ -364 +364 @@
         makeBack = False
         NewparmDict = {}
-        if Controls['Copy2Next']:
-            hId = Histo[histogram]['hId']
-            try:
-                nexthId = Histograms[histNames[ihst+1]]['hId']
-                for parm in parmDict:
-                    items = parm.split(':',2)
-                    if str(hId) in items[1] and parm in varyList:
-                        items[1] = str(nexthId)
-                        newparm = ':'.join(items)
-                        NewparmDict[newparm] = parmDict[parm]
-            except IndexError:
-                pass
+        # make dict of varied parameters in current histogram, renamed to
+        # next histogram, for use in next refinement. 
+        if Controls['Copy2Next'] and ihst < len(histNames)-1:
+            hId = Histo[histogram]['hId'] # current histogram
+            nexthId = Histograms[histNames[ihst+1]]['hId']
+            for parm in set(list(varyList)+list(varyListStart)):
+                items = parm.split(':')
+                if len(items) < 3: continue
+                if str(hId) in items[1]:
+                    items[1] = str(nexthId)
+                    newparm = ':'.join(items)
+                    NewparmDict[newparm] = parmDict[parm]
     G2stIO.SetSeqResult(GPXfile,Histograms,SeqResult)
     printFile.close()