Changeset 3390 for trunk/GSASIIdataGUI.py

Timestamp:

May 16, 2018 10:31:09 AM (5 years ago)

Author:

vondreele

Message:

fix issue with deleted phases in Restraints - they are now deleted from Restraints tree if selected
fix issue of a phase not used in any histogram - any set refine flags cause crash in refinement
now a phase is included in phase list if it is Used in any histogrsm - fixes to GetUsedHistogramsAndPhases? in G2strIO and GetUsedHistogramsAndPhasesfromTree? in G2dataGUI.
also some weird business in G2spc - had to swap two routines (SGProd & GetLittleGrpOps?) before debug in Spyder would load GSAS-II.

File:

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

trunk/GSASIIdataGUI.py

@@ -4184 +4184 @@
             Phase['pId'] = pId
             if Phase['Histograms']:
-                if phase not in Phases:
-                    Phases[phase] = Phase
                 for hist in Phase['Histograms']:
                     if 'Use' not in Phase['Histograms'][hist]:      #patch: add Use flag as True
                         Phase['Histograms'][hist]['Use'] = True         
                     if hist not in Histograms and Phase['Histograms'][hist]['Use']:
+                        if phase not in Phases:
+                            Phases[phase] = Phase
                         item = GetGPXtreeItemId(self,self.root,hist)
                         if item:
@@ -7742 +7742 @@
         if phaseName not in data:
             data[phaseName] = {}
-        G2restG.UpdateRestraints(G2frame,data[phaseName],phaseName)
+        G2restG.UpdateRestraints(G2frame,data,phaseName)
     elif G2frame.GPXtree.GetItemText(item) == 'Comments':
         SetDataMenuBar(G2frame,G2frame.dataWindow.DataCommentsMenu)