Changeset 2824

Timestamp:

May 10, 2017 9:14:10 AM (6 years ago)

Author:

vondreele

Message:

fix 2D strain d-zero calc
set Refine dlg=None default for easier scripting use
fix to put (?) space in BANK n

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (2 diffs)
• GSASIIstrMain.py (modified) (1 diff)
• imports/G2pwd_fxye.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1054 +1054 @@
         dmin = np.min(ring['ImtaCalc'][0])
         dmax = np.max(ring['ImtaCalc'][0])
-        if not ring.get('fixDset',True):
+        if 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.
+        else:
+            ring['Dcalc'] = np.mean(ring['ImtaCalc'][0])
 
 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],'fixDset':True})
+            'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0],'fixDset':False})
         UpdateStressStrain(G2frame,data)
         
@@ -2110 +2110 @@
             dzeroSizer.Add(dZero,0,WACV)
             Indx[dZero.GetId()] = id
-            dfix = wx.CheckBox(G2frame.dataDisplay,label='Hold?')
-            dfix.SetValue(dzero.get('fixDset',True))
+            dfix = wx.CheckBox(G2frame.dataDisplay,label='Use Poisson mean?')
+            dfix.SetValue(dzero.get('fixDset',False))
             dfix.Bind(wx.EVT_CHECKBOX,OnFixDset)
             Indx[dfix.GetId()] = id

trunk/GSASIIstrMain.py

@@ -127 +127 @@
     return IfOK,Rvals,result,covMatrix,sig
 
-def Refine(GPXfile,dlg):
+def Refine(GPXfile,dlg=None):
     'Global refinement -- refines to minimize against all histograms'
     import pytexture as ptx

trunk/imports/G2pwd_fxye.py

@@ -48 +48 @@
             if line[0] == '#': continue
             if line[:4] == 'BANK':
-                self.dnames.append(fname+' '+''.join(line.split()[:2]))
+                self.dnames.append(fname+' '+' '.join(line.split()[:2]))
                 nBanks += 1
                 continue