Changeset 3390 for trunk/GSASIIrestrGUI.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/GSASIIrestrGUI.py (modified) (1 diff)

trunk/GSASIIrestrGUI.py

@@ -1907 +1907 @@
 
     # UpdateRestraints execution starts here
-    phasedata = G2frame.GetPhaseData()[phaseName]
-    restrData = data
+    try:
+        phasedata = G2frame.GetPhaseData()[phaseName]
+    except KeyError:        #delete unknown or previously deleted phases from Restraints
+        rId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Restraints')
+        pId = G2gd.GetGPXtreeItemId(G2frame,rId,phaseName)
+        G2frame.GPXtree.Delete(pId)
+        print('Unknown phase '+phaseName+' is deleted from Restraints')
+        return
+    restrData = data[phaseName]
     if 'Bond' not in restrData:
         restrData['Bond'] = {'wtFactor':1.0,'Range':1.1,'Bonds':[],'Use':True}