Changeset 4825

Timestamp:

Feb 23, 2021 1:57:49 PM (2 years ago)

Author:

toby

Message:

remove unused & deleted hists from seq ref; option to remove hists from all phases; bugs for seq ref with unused hists

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (9 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIstrMain.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -3985 +3985 @@
             TextList.append(self.GPXtree.GetItemText(item))
             item, cookie = self.GPXtree.GetNextChild(sub, cookie)                
-        dlg = wx.MultiChoiceDialog(self, 'Which phase to delete?', 'Delete phase', TextList, wx.CHOICEDLG_STYLE)
+        dlg = wx.MultiChoiceDialog(self, 'Which phase(s) to delete?', 'Delete phase', TextList, wx.CHOICEDLG_STYLE)
         try:
             if dlg.ShowModal() == wx.ID_OK:
@@ -4877 +4877 @@
         return phaseData
 
-    def GetPhaseInfofromTree(self):
+    def GetPhaseInfofromTree(self, Used=False):
         '''Get the phase names and their rId values,
-        also the histograms used in each phase. 
-
+        also the histograms referenced in each phase. 
+
+        :param bool Used: if Used is True, only histograms that are
+            referenced in the histogram are returned
         :returns: (phaseRIdList, usedHistograms) where 
 
@@ -4899 +4901 @@
                 data = self.GPXtree.GetItemPyData(item)
                 UseList = data['Histograms']
-                usedHistograms[phaseName] = list(UseList.keys())
+                if Used:
+                    usedHistograms[phaseName] = [h for h in UseList if UseList[h]['Use']]
+                else:
+                    usedHistograms[phaseName] = list(UseList.keys())
                 item, cookie = self.GPXtree.GetNextChild(sub, cookie)
         return phaseRIdList,usedHistograms
@@ -5327 +5332 @@
         Controls = self.GPXtree.GetItemPyData(GetGPXtreeItemId(self,self.root, 'Controls'))
         Controls['ShowCell'] = True
+        for key in ('parmMinDict','parmMaxDict','parmFrozen'):
+            if key not in Controls: Controls[key] = {}
+        # check for deleted or unused histograms in refine list
+        phaseRIdList,histdict = self.GetPhaseInfofromTree(Used=True)
+        usedHistograms = []
+        for k in histdict:
+            usedHistograms += histdict[k]
+        usedHistograms = list(set(usedHistograms))
+        newseqList = [i for i in seqList if i in usedHistograms]
+        if len(newseqList) != len(seqList):
+            G2G.G2MessageBox(self,
+                str(len(seqList)-len(newseqList))+
+                ' histograms that are not used have been removed from the sequential list.',
+                'Histograms removed')
+            Controls['Seq Data'] = newseqList
+            seqList = newseqList
         self.OnFileSave(event)
         # check that constraints are OK here
@@ -5359 +5380 @@
         # select it
         self.PatternId = GetGPXtreeItemId(self,self.root,histNames[0])
-        if self.GPXtree.GetItemText(self.PatternId).startswith('PWDR '):
+        if self.PatternId and self.GPXtree.GetItemText(self.PatternId).startswith('PWDR '):
             refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
         else:
@@ -6536 +6557 @@
         def OnSelectData(event):
             choices = GetGPXtreeDataNames(G2frame,['PWDR','HKLF',])
+            phaseRIdList,histdict = G2frame.GetPhaseInfofromTree(Used=True)
+            usedHistograms = []
+            for k in histdict:
+                usedHistograms += histdict[k]
+            usedHistograms = list(set(usedHistograms))
+            choices = [i for i in choices if i in usedHistograms]
+            if len(choices) == 0:
+                G2G.G2MessageBox(self,
+                                'No histograms in use found for a sequential fit.',
+                                'No Histograms')
+                return
             sel = []
             try:
@@ -6544 +6576 @@
             except ValueError:  #data changed somehow - start fresh
                 sel = []
-            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Sequential refinement',
-                'Select dataset to include',choices)
+            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select datasets to include',
+                        'Sequential refinement selection',choices)
             dlg.SetSelections(sel)
             names = []
@@ -7992 +8024 @@
             Albls = [pfx+'A'+str(i) for i in range(6)]
             for name in histNames:
+                if name not in Histograms: continue
                 hId = Histograms[name]['hId']
                 phfx = '%d:%d:'%(pId,hId)
@@ -8282 +8315 @@
         for row,name in enumerate(histNames):
             deltaChi = G2frame.SeqTable.GetValue(row,deltaChiCol)
-            if deltaChi > 10.:
-                G2frame.dataDisplay.SetCellStyle(row,deltaChiCol,color=wx.Colour(255,0,0))
-            elif deltaChi > 1.0:
-                G2frame.dataDisplay.SetCellStyle(row,deltaChiCol,color=wx.Colour(255,255,0))
+            try:
+                if deltaChi > 10.:
+                    G2frame.dataDisplay.SetCellStyle(row,deltaChiCol,color=wx.Colour(255,0,0))
+                elif deltaChi > 1.0:
+                    G2frame.dataDisplay.SetCellStyle(row,deltaChiCol,color=wx.Colour(255,255,0))
+            except:
+                pass
     G2frame.dataDisplay.InstallGridToolTip(GridSetToolTip,GridColLblToolTip)
     #G2frame.dataDisplay.SendSizeEvent() # resize needed on mac

trunk/GSASIIphsGUI.py

@@ -9774 +9774 @@
         if G2frame.dataWindow.HistsInPhase:
             DelList = []
-            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Delete histogram', 
-                'Which histogram to delete from this phase?',G2frame.dataWindow.HistsInPhase)
+            extraOpts= {'label_0':'Remove from all phases','value_0':False}
+            h,pd = G2frame.GetUsedHistogramsAndPhasesfromTree()
+            if len(pd) > 1:
+                opts = extraOpts
+            else:
+                opts = {}
+            dlg = G2G.G2MultiChoiceDialog(G2frame, 
+                'Select histogram(s) to remove   \nfrom this phase:',
+                'Remove histograms', G2frame.dataWindow.HistsInPhase,
+                extraOpts=opts)
             try:
                 if dlg.ShowModal() == wx.ID_OK:
                     DelList = [G2frame.dataWindow.HistsInPhase[i] for i in dlg.GetSelections()]
-                    for i in DelList:
-                        del data['Histograms'][i]
             finally:
                 dlg.Destroy()
-        wx.CallAfter(G2ddG.UpdateDData,G2frame,DData,data)
-        
+            if extraOpts['value_0']:
+                for p in pd: 
+                    for i in DelList:
+                        if i in pd[p]['Histograms']: del pd[p]['Histograms'][i]
+            else:
+                for i in DelList:
+                    del data['Histograms'][i]
+            #wx.CallLater(100,G2ddG.UpdateDData,G2frame,DData,data) #  produces error
+            wx.CallAfter(UpdatePhaseData,G2frame,Item,data)
+            
     def OnDataApplyStrain(event):
         SGData = data['General']['SGData']        

trunk/GSASIIstrMain.py

@@ -605 +605 @@
         if histogram not in Histograms:
             G2fil.G2Print("Error: not found!")
-            continue
+            raise G2obj.G2Exception("refining with invalid histogram {}".
+                                        format(histogram))
         hId = Histograms[histogram]['hId']
         redphaseVary = phaseCheck(phaseVary,Phases,histogram)