Changeset 2823

Timestamp:

May 9, 2017 3:41:38 PM (6 years ago)

Author:

vondreele

Message:

implement hold flag for dzero adjustment in 2D strain fitting

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (6 diffs)

trunk/GSASIIimage.py

@@ -1054 +1054 @@
         dmin = np.min(ring['ImtaCalc'][0])
         dmax = np.max(ring['ImtaCalc'][0])
-        if abs(Eij[0]) < abs(Eij[2]):         #tension
-            ring['Dcalc'] = dmin+(dmax-dmin)/4.
-        else:                       #compression
-            ring['Dcalc'] = dmin+3.*(dmax-dmin)/4.
+        if not ring.get('fixDset',True):
+            if abs(Eij[0]) < abs(Eij[2]):         #tension
+                ring['Dcalc'] = dmin+(dmax-dmin)/4.
+            else:                       #compression
+                ring['Dcalc'] = dmin+3.*(dmax-dmin)/4.
 
 def calcFij(omg,phi,azm,th):

trunk/GSASIIimgGUI.py

@@ -1758 +1758 @@
     def OnAppendDzero(event):
         data['d-zero'].append({'Dset':1.0,'Dcalc':0.0,'pixLimit':10,'cutoff':1.0,
-            'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0]})
+            'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0],'fixDset':True})
         UpdateStressStrain(G2frame,data)
         
@@ -1821 +1821 @@
                 File = open(filename,'w')
                 keys = ['Type','Sample phi','Sample z','Sample load']
-                keys2 = ['Dset','Dcalc','pixLimit','cutoff','Emat']
+                keys2 = ['Dset','Dcalc','pixLimit','cutoff','Emat','fixDset']
                 File.write('{\n\t')
                 for key in keys:
@@ -2097 +2097 @@
             G2plt.PlotStrain(G2frame,data,newPlot=True)
             
+        def OnFixDset(event):
+            Obj = event.GetEventObject()
+            data['d-zero'][Indx[Obj.GetId()]]['fixDset'] = Obj.GetValue()
+            
         Indx = {}
         delIndx = []    
@@ -2106 +2110 @@
             dzeroSizer.Add(dZero,0,WACV)
             Indx[dZero.GetId()] = id
+            dfix = wx.CheckBox(G2frame.dataDisplay,label='Hold?')
+            dfix.SetValue(dzero.get('fixDset',True))
+            dfix.Bind(wx.EVT_CHECKBOX,OnFixDset)
+            Indx[dfix.GetId()] = id
+            dzeroSizer.Add(dfix,0,WACV)
             dzeroSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,label=(' d-zero ave: %.5f'%(dzero['Dcalc']))),0,WACV)
                 
@@ -2121 +2130 @@
             dzeroSizer.Add(pixLimit,0,WACV)                
                 
-            dzeroDelete = wx.CheckBox(parent=G2frame.dataDisplay,label='delete?')
-            dzeroDelete.Bind(wx.EVT_CHECKBOX,OnDeleteDzero)
-            delIndx.append(dzeroDelete)
-            dzeroSizer.Add(dzeroDelete,0,WACV)
-            
             dzeroSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,label=(' Strain tensor:')),WACV)
             names = ['e11','e12','e22']
@@ -2133 +2137 @@
                 tensorElem.SetBackgroundColour(VERY_LIGHT_GREY)
                 dzeroSizer.Add(tensorElem,0,WACV)
-            dzeroSizer.Add((5,5),0)             
+            dzeroDelete = wx.CheckBox(parent=G2frame.dataDisplay,label='delete?')
+            dzeroDelete.Bind(wx.EVT_CHECKBOX,OnDeleteDzero)
+            delIndx.append(dzeroDelete)
+            dzeroSizer.Add(dzeroDelete,0,WACV)
+            
         return dzeroSizer