Changeset 1843

Timestamp:

May 11, 2015 12:51:04 PM (8 years ago)

Author:

vondreele

Message:

put ';' in Debye fxn background terms (was ':')
fix mask issue with multi-integrations

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIstrIO.py (modified) (1 diff)

trunk/GSASIIimgGUI.py

@@ -218 +218 @@
                                 try:
                                     Masks = G2frame.PatternTree.GetItemPyData(
-                                        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
+                                        G2gd.GetPatternTreeItemId(G2frame,id, 'Masks'))
                                 except TypeError:       #missing Masks
                                     Imin,Imax = Data['Range']
                                     Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
                                     G2frame.PatternTree.SetItemPyData(
-                                        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'),Masks)
+                                        G2gd.GetPatternTreeItemId(G2frame,id, 'Masks'),Masks)
                                 CleanupMasks(Masks)
                                 if len(backImage):                                

trunk/GSASIIstrIO.py

@@ -2789 +2789 @@
         if DebyePeaks['nDebye']:
             for i in range(DebyePeaks['nDebye']):
-                names = [pfx+'DebyeA:'+str(i),pfx+'DebyeR:'+str(i),pfx+'DebyeU:'+str(i)]
+                names = [pfx+'DebyeA;'+str(i),pfx+'DebyeR;'+str(i),pfx+'DebyeU;'+str(i)]
                 for j,name in enumerate(names):
                     DebyePeaks['debyeTerms'][i][2*j] = parmDict[name]