Changeset 5239 for trunk

Timestamp:

Mar 18, 2022 8:23:49 PM (3 years ago)

Author:

toby

Message:

add warning when phase fraction constraint is added as per Bob

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (3 diffs)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIrestrGUI.py (modified) (1 diff)

trunk/GSASIIconstrGUI.py ¶

@@ -1691 +1691 @@
         
 ###### check scale & phase fractions, create constraint if needed #############
-def CheckAllScalePhaseFractions(G2frame):
+def CheckAllScalePhaseFractions(G2frame,refine=True):
     '''Check if scale factor and all phase fractions are refined without a constraint
     for all used histograms, if so, offer the user a chance to create a constraint
     on the sum of phase fractions
+
+    :returns: False if refinement should be continued
     '''
     histograms, phases = G2frame.GetUsedHistogramsAndPhasesfromTree()
@@ -1709 +1711 @@
         if i: msg += ', '
         msg += str(h)
-    msg += '. This is not recommended as it will produce an unstable refinement. Do you want to create constrain(s) on the sum of phase fractions to address this? (Press "No" to continue without)'
-    dlg = wx.MessageDialog(G2frame,msg,'Warning: Constraint Needed',wx.YES|wx.NO)
+    msg += '. This is not recommended as it will produce an unstable refinement. Do you want to create constrain(s) on the sum of phase fractions to address this?'
+    if refine:
+        msg += '\n\nRefinement may cause a significant shift in scaling, so it may be best to refine only a few other parameters (Press "No" to continue refinement without, "Cancel" to stop.)'
+        opts = wx.YES|wx.NO|wx.CANCEL
+    else:
+        opts = wx.YES|wx.NO
+    dlg = wx.MessageDialog(G2frame,msg,'Warning: Constraint Needed',opts)
     ans = dlg.ShowModal()
     dlg.Destroy()
@@ -1727 +1734 @@
         wx.CallAfter(G2frame.GPXtree.SelectItem,cId) # should call SelectDataTreeItem
         UpdateConstraints(G2frame,Constraints,1,True) # repaint with HAP tab
-        return True
-    return False
-        
+        return False
+    elif ans == wx.ID_NO:
+        return False
+    return True
+
 def CheckScalePhaseFractions(G2frame,hist,histograms,phases,Constraints):
     '''Check if scale factor and all phase fractions are refined without a constraint

trunk/GSASIIdataGUI.py ¶

@@ -5289 +5289 @@
         for a sequential fit. 
         '''
-        if G2cnstG.CheckAllScalePhaseFractions(self): return
+        if G2cnstG.CheckAllScalePhaseFractions(self,refine=False): return
         try:
             parmDict,varyList = self.MakeLSParmDict()

trunk/GSASIIrestrGUI.py ¶

@@ -190 +190 @@
         numerical values (only)
         '''
-        G2cnstG.CheckAllScalePhaseFractions(G2frame)
+        G2cnstG.CheckAllScalePhaseFractions(G2frame,refine=False)
         try:
             parmDict,varyList = G2frame.MakeLSParmDict()