Changeset 2701 for trunk/GSASIIpwdGUI.py

Timestamp:

Feb 13, 2017 2:58:18 PM (6 years ago)

Author:

vondreele

Message:

Rename ShowLSParms to OnShowLSParms
Add [Ymin,Ymax] to PWDR data[0] dict as 'Yminmax'
shift Phases = up a few lines to fix plot open bugs
Also PDFdata = up a few lines
Provide a ResetFlatBkg? to provide a start for Flat Bkg based on sample, Background, Container mns & mults for PDF.

File:

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

trunk/GSASIIpwdGUI.py

@@ -4724 +4724 @@
                 Obj.SetValue(fmt%(value))
                 data[fileKey][itemKey] = value
+                ResetFlatBkg()
                 wx.CallLater(100,UpdatePDFGrid,G2frame,data)
                 wx.CallAfter(OnComputePDF,None)
@@ -4731 +4732 @@
                 mult.SetValue(data[key]['Mult'])
                 multSpin.SetValue(0)
+                ResetFlatBkg()
+                wx.CallLater(100,UpdatePDFGrid,G2frame,data)
                 wx.CallAfter(OnComputePDF,None)
                             
-            def AfterChange(invalid,value,tc):
+            def OnMult(invalid,value,tc):
                 if invalid: return
+                ResetFlatBkg()
+                wx.CallLater(100,UpdatePDFGrid,G2frame,data)
                 wx.CallAfter(OnComputePDF,None)
             
@@ -4748 +4753 @@
             mulBox = wx.BoxSizer(wx.HORIZONTAL)
             mult = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,item,'Mult',nDig=(10,3),
-                typeHint=float,OnLeave=AfterChange)
+                typeHint=float,OnLeave=OnMult)
             mulBox.Add(mult,0,)
             multSpin = wx.SpinButton(G2frame.dataDisplay,style=wx.SP_VERTICAL,size=wx.Size(20,25))
@@ -4756 +4761 @@
             mulBox.Add(multSpin,0,WACV)
             fileSizer.Add(mulBox,0,WACV)
-        
+            
+        def ResetFlatBkg():
+            Smin = np.min(G2frame.PatternTree.GetItemPyData(
+                G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'PWDR'+dataFile[4:]))[1][1])
+            Bmin = 0; Cmin = 0.; Cmul = 0.; CBmin = 0.
+            if data['Sample Bkg.']['Name']:
+                Bmin = np.min(G2frame.PatternTree.GetItemPyData(
+                G2gd.GetPatternTreeItemId(G2frame,G2frame.root,data['Sample Bkg.']['Name']))[1][1])
+                Smin += Bmin*data['Sample Bkg.']['Mult']
+            if data['Container']['Name']:
+                Cmin = np.min(G2frame.PatternTree.GetItemPyData(
+                G2gd.GetPatternTreeItemId(G2frame,G2frame.root,data['Container']['Name']))[1][1])
+                Cmul = data['Container']['Mult']
+                if data['Container Bkg.']['Name']:
+                    CBmin = np.min(G2frame.PatternTree.GetItemPyData(
+                        G2gd.GetPatternTreeItemId(G2frame,G2frame.root,data['Container Bkg.']['Name']))[1][1])
+                    Cmin += CBmin*data['Container Bkg.']['Mult']
+                Smin += Cmul*Cmin
+            data['Flat Bkg'] = Smin
+                            
         PDFfileSizer = wx.BoxSizer(wx.VERTICAL)
         PDFfileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' PDF data files: '),0,WACV)
         PDFfileSizer.Add((5,5),0)    
         if 'C' in inst['Type'][0]:
-            str = ' Sample file: PWDR %s   Wavelength, A: %.5f  Energy, keV: %.3f  Polariz.: %.2f '%(dataFile[3:],wave,keV,polariz)
+            str = ' Sample file: PWDR%s   Wavelength, A: %.5f  Energy, keV: %.3f  Polariz.: %.2f '%(dataFile[4:],wave,keV,polariz)
             PDFfileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=str),0,WACV)
         PDFfileSizer.Add((5,5),0)
@@ -4926 +4950 @@
         sqBox = wx.BoxSizer(wx.HORIZONTAL)
         sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Detector type: '),0,WACV)
-        choice = ['Image plate','Point detector']
+        choice = ['Area detector','Point detector']
         detType = wx.ComboBox(G2frame.dataDisplay,value=data['DetType'],choices=choice,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
         detType.Bind(wx.EVT_COMBOBOX, OnDetType)
         sqBox.Add(detType,0)
-        if data['DetType'] == 'Image plate':
+        if data['DetType'] == 'Area detector':
             sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' IP transmission coeff.: '),0,WACV)
             obliqCoeff = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'ObliqCoeff',nDig=(10,3),min=0.0,max=1.0,