Changeset 3326 for trunk

Timestamp:

Mar 29, 2018 3:52:00 PM (7 years ago)

Author:

vondreele

Message:

fix missing setdist error in Copy selected for image controls
set Bruker image reader to give Ka1 for wavelength (better than Ka-bar for calibration)
modify SumDialog? to do upon request PWDR average instead of sum - works nicely with Bruker image data
some menu changes with this

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (9 diffs)
• GSASIIimgGUI.py (modified) (1 diff)
• imports/G2img_SFRM.py (modified) (1 diff)

trunk/GSASIIdataGUI.py ¶

@@ -477 +477 @@
         item = parent.Append(wx.ID_ANY,'Read Powder Pattern Peaks...','')
         self.Bind(wx.EVT_MENU, self.OnReadPowderPeaks, id=item.GetId())
-        item = parent.Append(wx.ID_ANY,'Sum powder data','')
+        item = parent.Append(wx.ID_ANY,'Sum or Average powder data','')
         self.Bind(wx.EVT_MENU, self.OnPwdrSum, id=item.GetId())
         item = parent.Append(wx.ID_ANY,'Sum image data','')
@@ -3031 +3031 @@
             self.text = text
             self.data = data
+            self.average = False
             self.selectData = copy.copy(data[:-1])
             self.selectVals = len(data)*[0.0,]
@@ -3074 +3075 @@
                 ScaleAll = wx.Button(self.panel,wx.ID_ANY,'Set all above')
                 ScaleAll.Bind(wx.EVT_BUTTON, self.OnAllScale)
+                if self.dataType == 'PWDR':
+                    self.Avg = wx.CheckBox(self.panel,label=' Make average?')
+                    self.Avg.Bind(wx.EVT_CHECKBOX,self.OnAve)
                 self.dataGridSizer.Add(ScaleAll,0,wx.LEFT,10)
-                self.dataGridSizer.Add((-1,-1),0,wx.RIGHT,10)
-                self.dataGridSizer.Add(wx.StaticText(self.panel,-1,'Sum result name: '+self.dataType),1,
+                self.dataGridSizer.Add(self.Avg,0,wx.RIGHT,10)
+                self.dataGridSizer.Add(wx.StaticText(self.panel,-1,' Result name: '+self.dataType),1,
                     wx.LEFT|wx.ALIGN_CENTER_VERTICAL,1)
                 self.name = G2G.ValidatedTxtCtrl(self.panel,self.data,-1,size=wx.Size(300,20))
@@ -3102 +3106 @@
             self.panel.Fit()
             self.Fit()
+            
+        def OnAve(self,event):
+            self.average = self.Avg.GetValue()
 
         def OnFilter(self,event):
@@ -3176 +3183 @@
                                 '\nFound:   '+str(x[0])+' '+str(x[-1])+'\nfor '+name)
                             self.OnCancel(event)
-                        else:
-                            for j,yi in enumerate(y):
-                                 Ysum[j] += scale*yi
-                                 Vsum[j] += abs(scale)*v[j]
                     else:
                         Xminmax = [x[0],x[-1]]
                         Xsum = x
-                        Ysum = scale*y
-                        Vsum = abs(scale*v)
-            Wsum = 1./np.array(Vsum)
+                    if self.dataType == 'PWDR' and self.average:
+                        Ysum.append(scale*y)
+                        Vsum.append(abs(scale)*v)
+                    else:
+                        try:
+                            Ysum += scale*y
+                            Vsum += abs(scale)*v
+                        except ValueError:
+                            Ysum = scale*y
+                            Vsum = abs(scale)*v
+            if self.dataType =='PWDR' and self.average:
+                maYsum = ma.masked_equal(Ysum,0)
+                Ysum = ma.mean(maYsum,axis=0)
+                Wsum = 1./np.array(Ysum)
+            else:
+                Wsum = 1./Vsum
             YCsum = np.zeros(lenX)
             YBsum = np.zeros(lenX)
@@ -3219 +3235 @@
                         
     def OnPwdrSum(self,event):
-        'Sum together powder data(?)'
+        'Sum or Average together powder data(?)'
         TextList = []
         DataList = []
         Names = []
         Inst = None
-        Comments = ['Sum equals: \n']
+        Comments = ['Sum/Average equals: \n']
         if self.GPXtree.GetCount():
             item, cookie = self.GPXtree.GetFirstChild(self.root)
@@ -3237 +3253 @@
                 item, cookie = self.GPXtree.GetNextChild(self.root, cookie)
             if len(TextList) < 2:
-                self.ErrorDialog('Not enough data to sum','There must be more than one "PWDR" pattern')
+                self.ErrorDialog('Not enough data to sum/average','There must be more than one "PWDR" pattern')
                 return
-            TextList.append('default_sum_name')                
-            dlg = self.SumDialog(self,'Sum data','Enter scale for each pattern to be summed','PWDR',TextList,DataList)
+            TextList.append('default_ave_name')                
+            dlg = self.SumDialog(self,'Sum/Average data',' Enter scale for each pattern to be summed/averaged','PWDR',TextList,DataList)
             try:
                 if dlg.ShowModal() == wx.ID_OK:
@@ -3307 +3323 @@
                 return
             TextList.append('default_sum_name')                
-            dlg = self.SumDialog(self,'Sum data','Enter scale for each image to be summed','IMG',TextList,DataList)
+            dlg = self.SumDialog(self,'Sum data',' Enter scale for each image to be summed','IMG',TextList,DataList)
             try:
                 if dlg.ShowModal() == wx.ID_OK:
@@ -5749 +5765 @@
         'average the selected columns from menu command'
         cols = sorted(G2frame.dataDisplay.GetSelectedCols()) # ignore selection order
-        useCol = -np.array(G2frame.SeqTable.GetColValues(0),dtype=bool)
+        useCol =  not np.array(G2frame.SeqTable.GetColValues(0),dtype=bool)
         if cols:
             for col in cols:

trunk/GSASIIimgGUI.py ¶

@@ -171 +171 @@
     if data['DetDepth'] > 0.5:
         data['DetDepth'] /= data['distance']
+    if 'setdist' not in data:
+        data['setdist'] = data['distance']
 #end patch
 

trunk/imports/G2img_SFRM.py ¶

@@ -61 +61 @@
         stream = stream.decode('latin-1')
     starter = 'IMG: '
-    meanwaves = {'Cu':1.54178,'Ti':2.74963,'Cr':2.29092,'Fe':1.93728,
-        'Co':1.79021,'Mo':0.71069,'Ag':0.56083}
+    meanwaves = {'Cu':1.54051,'Ti':2.74841,'Cr':2.28962,'Fe':1.93597,
+        'Co':1.78892,'Mo':0.70926,'Ag':0.559363}
     imageBeg = stream.find(starter)+4
     head = np.array(list(stream[:imageBeg].split('CFR:')[0]))