Changeset 3885

Timestamp:

Apr 9, 2019 3:30:40 PM (4 years ago)

Author:

toby

Message:

correct seq ref hist error

File:

• trunk/GSASIIstrIO.py (modified) (6 diffs)

trunk/GSASIIstrIO.py

@@ -62 +62 @@
 (gpxSize) and to index where to find each 1st-level tree item in the file.
 '''
-tmpHistIndex = {}
-'Global variable used to index contents of .seqHist file'
 
 def GetFullGPX(GPXfile):
@@ -659 +657 @@
     fp.close()
     # create empty file for histogram info
-    tmpHistIndex.clear()
     GPXhist = os.path.splitext(GPXfile)[0]+'.seqHist'
     fp = open(GPXhist,'wb')
@@ -725 +722 @@
     GPXhist = os.path.splitext(GPXfile)[0]+'.seqHist'
     fp = open(GPXhist,'ab')
-    tmpHistIndex[histname] = fp.tell()
     cPickle.dump(data,fp,1)
     fp.close()
-    return    
+    return
     
 def SetSeqResult(GPXfile,Histograms,SeqResult):
@@ -755 +751 @@
     GPXhist = os.path.splitext(GPXfile)[0]+'.seqHist'
     hist = open(GPXhist,'rb')
+    # build an index to the GPXhist file
+    histIndex = {}
+    while True:
+        loc = hist.tell()
+        try:
+            datum = cPickleLoad(hist)[0]
+        except EOFError:
+            break
+        histIndex[datum[0]] = loc
+
     infile = open(GPXback,'rb')
     outfile = open(GPXfile,'wb')
@@ -775 +781 @@
         elif datum[0] == 'Controls': # reset the Copy Next flag after a sequential fit
             data[0][1]['Copy2Next'] = False
-        elif datum[0] in tmpHistIndex:
-            hist.seek(tmpHistIndex[datum[0]])
+        elif datum[0] in histIndex:
+            hist.seek(histIndex[datum[0]])
             hdata = cPickleLoad(hist)
+            if GSASIIpath.GetConfigValue('debug'): 
+                print('Updating {} with {}'.format(data[0][0],hdata[0][0]))
             xferItems = ['Background','Instrument Parameters','Sample Parameters','Reflection Lists']
             hItems = {name:j+1 for j,(name,val) in enumerate(hdata[1:]) if name in xferItems}
@@ -795 +803 @@
     outfile.close()
     # clean up tmp files
-    tmpHistIndex.clear()
     try:
         os.remove(GPXphase)