Changeset 2729

Timestamp:

Feb 28, 2017 1:29:02 PM (6 years ago)

Author:

vondreele

Message:

add estimate of Sample Back multiplier based on exposure times & no. frames from PWDR comments; Needs 'exposureTime' & 'summedExposures' to be in metadata file for image, otherwise Mult =1.0
Provide helpful hints in Status bar for Mult refinement.
Suppress reset of Flat Bkg when Mult is changed by user

File:

• trunk/GSASIIpwdGUI.py (modified) (7 diffs)

trunk/GSASIIpwdGUI.py

@@ -4633 +4633 @@
         print('  Optimizing corrections to improve G(r) at low r')
         if data['Sample Bkg.']['Refine']:
+#            data['Flat Bkg'] = 0.
             print('  start: Ruland={:.3f}, Sample Bkg mult={:.3f} (RMS:{:.4f})'.format(
                 data['Ruland'],data['Sample Bkg.']['Mult'],rms))
@@ -4737 +4738 @@
                 Obj.SetValue(fmt%(value))
                 data[fileKey][itemKey] = value
+                data[fileKey]['Mult'] = GetExposure(value)
                 ResetFlatBkg()
                 wx.CallLater(100,UpdatePDFGrid,G2frame,data)
@@ -4745 +4747 @@
                 mult.SetValue(data[key]['Mult'])
                 multSpin.SetValue(0)
-                ResetFlatBkg()
+#                ResetFlatBkg()
                 wx.CallLater(100,UpdatePDFGrid,G2frame,data)
                 wx.CallAfter(OnComputePDF,None)
@@ -4751 +4753 @@
             def OnMult(invalid,value,tc):
                 if invalid: return
-                ResetFlatBkg()
+#                ResetFlatBkg()
                 wx.CallLater(100,UpdatePDFGrid,G2frame,data)
                 wx.CallAfter(OnComputePDF,None)
@@ -4757 +4759 @@
             def OnRefMult(event):
                 item['Refine'] = refMult.GetValue()
+                if item['Refine']:
+                    Status.SetStatusText('Be sure Mult is close to anticipated value. '+   \
+                        'Suggest setting Flat Bkg. to 0 before Optimize Mult')
+            
+            def GetExposure(backFile):
+                dataId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'PWDR'+dataFile[4:])
+                dataComments = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,dataId,'Comments'))
+                backId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,data['Sample Bkg.']['Name'])
+                backComments = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,backId,'Comments'))
+                expTime = 1.
+                sumExp = 1.
+                for item in dataComments:
+                    if 'exposureTime' in item:
+                        expTime = float(item.split('=')[1])
+                    if 'summedExposures' in item:
+                        sumExp = float(item.split('=')[1])
+                dataExp = expTime*sumExp
+                expTime = 1.
+                sumExp = 1.
+                for item in backComments:
+                    if 'exposureTime' in item:
+                        expTime = float(item.split('=')[1])
+                    if 'summedExposures' in item:
+                        sumExp = float(item.split('=')[1])
+                backExp = expTime*sumExp
+                return -dataExp/backExp
             
             item = data[key]
@@ -4784 +4812 @@
             else:
                 fileSizer.Add((5,5),0)
-            
+                            
         def ResetFlatBkg():
             Smin = np.min(G2frame.PatternTree.GetItemPyData(
@@ -4905 +4933 @@
                 G2frame.ErrorDialog('PDF error','Chemical formula not defined')
                 return
+            Status.SetStatusText('')
             wx.BeginBusyCursor()
             try: