Changeset 2183 for trunk/GSASIIphsGUI.py

Timestamp:

Mar 24, 2016 9:58:40 AM (8 years ago)

Author:

vondreele

Message:

fix General - atomic wt. now updated on isotope change
add new Stacking fault option to make sequence of DIFFaX runs varying one variable - under development
fix problem in G2image & G2imageGUI where change in FlatBkg?, Background or Dark didn't change thresholds or image plot limits - these are now set to new image limits.
Some of these used tricky changes to sizer values

File:

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

trunk/GSASIIphsGUI.py

@@ -418 +418 @@
                         G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadDIFFaX, id=G2gd.wxID_LOADDIFFAX)
                         G2frame.dataFrame.Bind(wx.EVT_MENU, OnSimulate, id=G2gd.wxID_LAYERSIMULATE)
+                        G2frame.dataFrame.Bind(wx.EVT_MENU, OnSeqSimulate, id=G2gd.wxID_SEQUENCESIMULATE)
                         if 'Wave Data' in pages:
                             pass
@@ -626 +627 @@
         def ElemSizer():
             
-            def OnIsotope(event):   #how can I update Atom weight on isotope change?
+            def OnIsotope(event):
                 Obj = event.GetEventObject()
                 item = Indx[Obj.GetId()]
                 isotope = Obj.GetValue()
+                nCols = len(generalData['AtomTypes'])+1
                 data['General']['Isotope'][item] = isotope
                 indx = generalData['AtomTypes'].index(item)
-                data['General']['AtomMass'][indx] = generalData['Isotopes'][item][isotope]['Mass']
+                wt = generalData['Isotopes'][item][isotope]['Mass']
+                elemSizer.GetChildren()[indx+3*nCols+1].Window.SetValue('%.3f'%(wt))    #tricky
+                data['General']['AtomMass'][indx] = wt
                 density,mattCoeff = G2mth.getDensity(generalData)
                 denSizer[1].SetValue('%.3f'%(density))
@@ -2925 +2929 @@
         dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
         if dlg.ShowModal() == wx.ID_OK:
-            ctrls,plane,lmax = dlg.GetSelection()
+            ctrls,plane,lmax,x,x,x = dlg.GetSelection()
             data['Layers']['Sadp'] = {}
             data['Layers']['Sadp']['Plane'] = plane
@@ -2966 +2970 @@
         else:   #selected area
             G2pwd.StackSim(data['Layers'],ctrls)
-#            G2pwd.CalcStackingSADP(data['Layers'])
+#            if GSASIIpath.GetConfigValue('debug'):
+#                G2pwd.CalcStackingSADP(data['Layers'])
         wx.CallAfter(UpdateLayerData)
+        
+    def OnSeqSimulate(event):
+        
+        ctrls = ''
+        Parms = G2pwd.GetStackParms(data['Layers'])
+        dlg = G2gd.DIFFaXcontrols(G2frame,ctrls,Parms)
+        if dlg.ShowModal() == wx.ID_OK:
+            ctrls,plane,lmax,parm,parmRange,parmStep = dlg.GetSelection()
+            data['Layers']['Sadp'] = {}
+            data['Layers']['Sadp']['Plane'] = plane
+            data['Layers']['Sadp']['Lmax'] = lmax
+            data['Layers']['Multi'] = [parm,parmRange,parmStep]
+        else:
+            return
+        print 'do sequence of simulations on...',parm,parmRange,parmStep
         
 ################################################################################
@@ -7088 +7108 @@
             FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.WavesData)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnWaveVary, id=G2gd.wxID_WAVEVARY)
-        # Stacking faults wxID_LAYERSIMULATE
+        # Stacking faults 
         if data['General']['Type'] == 'faulted':
             FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.LayerData)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadDIFFaX, id=G2gd.wxID_LOADDIFFAX)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnSimulate, id=G2gd.wxID_LAYERSIMULATE)
+            G2frame.dataFrame.Bind(wx.EVT_MENU, OnSeqSimulate, id=G2gd.wxID_SEQUENCESIMULATE)
         # Draw Options
         FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.DataDrawOptions)