Changeset 1232

Timestamp:

Feb 26, 2014 12:41:28 PM (9 years ago)

Author:

vondreele

Message:

add copy substances
fix azimuth offset in polarization calc
make sasd come out as semilog plot
fix limits in log plots

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimage.py (modified) (1 diff)
• GSASIIplot.py (modified) (7 diffs)
• GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASII.py

@@ -2051 +2051 @@
                             Data['fullIntegrate'] = False
                             Data['setRings'] = False
-                            Data['background image'] = ['',1.0]                            
+                            Data['background image'] = ['',-1.0]                            
+                            Data['dark image'] = ['',-1.0]
                         Data['setDefault'] = False
                         Data['range'] = [(Imin,Imax),[Imin,Imax]]

trunk/GSASIIgrid.py

@@ -135 +135 @@
 
 [ wxID_MODELCOPY,wxID_MODELFIT,wxID_ELEMENTADD,wxID_ELEMENTDELETE,wxID_ADDSUBSTANCE,
-    wxID_LOADSUBSTANCE,wxID_DELETESUBSTANCE,
-] = [wx.NewId() for item in range(7)]
+    wxID_LOADSUBSTANCE,wxID_DELETESUBSTANCE,wxID_COPYSUBSTANCE,
+] = [wx.NewId() for item in range(8)]
 
 [ wxID_SELECTPHASE,
@@ -2550 +2550 @@
         self.SubstanceEdit.Append(id=wxID_ADDSUBSTANCE, kind=wx.ITEM_NORMAL,text='Add substance',
             help='Add new substance to list')
+        self.SubstanceEdit.Append(id=wxID_COPYSUBSTANCE, kind=wx.ITEM_NORMAL,text='Copy substances',
+            help='Copy substances')
         self.SubstanceEdit.Append(id=wxID_DELETESUBSTANCE, kind=wx.ITEM_NORMAL,text='Delete substance',
             help='Delete substance from list')            

trunk/GSASIIimage.py

@@ -883 +883 @@
         H0 /= G2pwd.Oblique(data['Oblique'][0],H2[:-1])
     if 'SASD' in data['type'] and data['PolaVal'][1]:
-        H0 /= np.array([G2pwd.Polarization(data['PolaVal'][0],H2[:-1],Azm=azm)[0] for azm in (H1[:-1]+np.diff(H1)/2.)])
+        #NB: in G2pwd.Polarization azm is defined from plane of polarization, not image x axis!
+        H0 /= np.array([G2pwd.Polarization(data['PolaVal'][0],H2[:-1],Azm=azm-90.)[0] for azm in (H1[:-1]+np.diff(H1)/2.)])
     Nup += 1
     if dlg:

trunk/GSASIIplot.py

@@ -857 +857 @@
                 elif 'SASD' in plottype:
                     D = xye[4]-Ymax*G2frame.delOffset
+                    Plot.set_yscale("log",nonposy='mask')
+                    Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
                 if G2frame.logPlot:
                     if 'PWDR' in plottype:
@@ -889 +891 @@
                         if G2frame.logPlot:
                             Plot.set_yscale("log",nonposy='mask')
-                            Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.)
+                            Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
                     if 'PWDR' in plottype:
                         Plot.plot(X,W,colors[(N+2)%6],picker=False)
@@ -922 +924 @@
                     elif 'SASD' in plottype:
                         Plot.semilogy(X,Y,colors[N%6],picker=False,nonposy='mask')
-                        Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.)
+                        Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
             if G2frame.logPlot:
-                Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.)
+                Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
     if PickId and not G2frame.Contour:
         Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Instrument Parameters'))
@@ -2308 +2310 @@
                 G2frame.MaskKey = event.key
                 OnStartMask(G2frame)
+                PlotImage(G2frame,newPlot=False)
                 
         elif PickName == 'Stress/Strain':
@@ -2313 +2316 @@
                 G2frame.StrainKey = event.key
                 OnStartNewDzero(G2frame)
+                PlotImage(G2frame,newPlot=False)
                 
         elif PickName == 'Image Controls':
@@ -2327 +2331 @@
                         Data['center'] = [Xpos,Ypos]
                         G2imG.UpdateImageControls(G2frame,Data,Masks)
+                        PlotImage(G2frame,newPlot=False)
                 finally:
                     dlg.Destroy()
+                return
             elif event.key == 'l':
                 G2frame.logPlot = not G2frame.logPlot
@@ -2335 +2341 @@
             elif event.key in ['y',]:
                 Data['invert_y'] = not Data['invert_y']
-        PlotImage(G2frame,newPlot=False)
+            PlotImage(G2frame,newPlot=True)
             
     def OnKeyBox(event):

trunk/GSASIIpwdGUI.py

@@ -2185 +2185 @@
                          
         UpdateSubstanceGrid(G2frame,data)
+        
+    def OnCopySubstance(event):
+        histList = ['All',]+G2gd.GetPatternTreeDataNames(G2frame,['SASD',])
+        copyList = []
+        dlg = wx.MultiChoiceDialog(G2frame, 
+            'Copy substances to which histograms?', 'Copy substances', 
+            histList, wx.CHOICEDLG_STYLE)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                result = dlg.GetSelections()
+                for i in result: 
+                    copyList.append(histList[i])
+                if 'All' in copyList: 
+                    copyList = histList[1:]
+            for item in copyList:
+                Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
+                G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Substances'),
+                    copy.copy(data))
+        finally:
+            dlg.Destroy()        
     
     def OnAddSubstance(event):
@@ -2383 +2403 @@
     G2frame.dataFrame.SetLabel('Substances')
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadSubstance, id=G2gd.wxID_LOADSUBSTANCE)    
-    G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddSubstance, id=G2gd.wxID_ADDSUBSTANCE)    
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddSubstance, id=G2gd.wxID_ADDSUBSTANCE)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopySubstance, id=G2gd.wxID_COPYSUBSTANCE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteSubstance, id=G2gd.wxID_DELETESUBSTANCE)    
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddElement, id=G2gd.wxID_ELEMENTADD)
@@ -2422 +2443 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
+    print data
 
     mainSizer.Layout()