Changeset 1007 for trunk/GSASIIphsGUI.py

Timestamp:

Jul 23, 2013 1:28:36 PM (10 years ago)

Author:

vondreele

Message:

"improved" Pawley extraction by flipping negative intensitied to 1/2 or 1/3 value on Pawley Update.

File:

• trunk/GSASIIphsGUI.py (modified) (5 diffs)

trunk/GSASIIphsGUI.py

@@ -497 +497 @@
                 except ValueError:
                     pass
-                pawlNegWt.SetValue("%.2f"%(generalData['Pawley neg wt']))          #reset in case of error                
+                pawlNegWt.SetValue("%.4f"%(generalData['Pawley neg wt']))          #reset in case of error                
 
             pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -511 +511 @@
             pawleySizer.Add(pawlVal,0,wx.ALIGN_CENTER_VERTICAL)
             pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,wx.ALIGN_CENTER_VERTICAL)
-            pawlNegWt = wx.TextCtrl(General,value='%.2f'%(generalData['Pawley neg wt']),style=wx.TE_PROCESS_ENTER)
+            pawlNegWt = wx.TextCtrl(General,value='%.4f'%(generalData['Pawley neg wt']),style=wx.TE_PROCESS_ENTER)
             pawlNegWt.Bind(wx.EVT_TEXT_ENTER,OnPawleyNegWt)        
             pawlNegWt.Bind(wx.EVT_KILL_FOCUS,OnPawleyNegWt)
@@ -4561 +4561 @@
 
     def OnPawleyUpdate(event):
+        '''This is the place for any reflection modification trick
+        Patterson squared, leBail extraction, etc.
+        '''
         try:
             Refs = data['Pawley ref']
@@ -4570 +4573 @@
         PatternId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,HistoNames[0])
         refData = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))[PhaseName]
-
+        Inv = data['General']['SGData']['SGInv']
+        mult = 0.5
+        if Inv:
+            mult = 0.3
         wx.BeginBusyCursor()
         try:
@@ -4576 +4582 @@
                 try:
                     if refData[iref][9] < 0.:
-                        ref[6] = abs(refData[iref][9])
+                        ref[6] = abs(refData[iref][9])*mult
+                        refData[iref][8] *= -mult
+                        refData[iref][9] *= -mult
+                        ref[5] = False
                         ref[7] = 1.0
                 except IndexError: