Changeset 2824


Ignore:
Timestamp:
May 10, 2017 9:14:10 AM (5 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2823 r2824  
    10541054        dmin = np.min(ring['ImtaCalc'][0])
    10551055        dmax = np.max(ring['ImtaCalc'][0])
    1056         if not ring.get('fixDset',True):
     1056        if ring.get('fixDset',True):
    10571057            if abs(Eij[0]) < abs(Eij[2]):         #tension
    10581058                ring['Dcalc'] = dmin+(dmax-dmin)/4.
    10591059            else:                       #compression
    10601060                ring['Dcalc'] = dmin+3.*(dmax-dmin)/4.
     1061        else:
     1062            ring['Dcalc'] = np.mean(ring['ImtaCalc'][0])
    10611063
    10621064def calcFij(omg,phi,azm,th):
  • trunk/GSASIIimgGUI.py

    r2823 r2824  
    17581758    def OnAppendDzero(event):
    17591759        data['d-zero'].append({'Dset':1.0,'Dcalc':0.0,'pixLimit':10,'cutoff':1.0,
    1760             'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0],'fixDset':True})
     1760            'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0],'fixDset':False})
    17611761        UpdateStressStrain(G2frame,data)
    17621762       
     
    21102110            dzeroSizer.Add(dZero,0,WACV)
    21112111            Indx[dZero.GetId()] = id
    2112             dfix = wx.CheckBox(G2frame.dataDisplay,label='Hold?')
    2113             dfix.SetValue(dzero.get('fixDset',True))
     2112            dfix = wx.CheckBox(G2frame.dataDisplay,label='Use Poisson mean?')
     2113            dfix.SetValue(dzero.get('fixDset',False))
    21142114            dfix.Bind(wx.EVT_CHECKBOX,OnFixDset)
    21152115            Indx[dfix.GetId()] = id
  • trunk/GSASIIstrMain.py

    r2721 r2824  
    127127    return IfOK,Rvals,result,covMatrix,sig
    128128
    129 def Refine(GPXfile,dlg):
     129def Refine(GPXfile,dlg=None):
    130130    'Global refinement -- refines to minimize against all histograms'
    131131    import pytexture as ptx
  • trunk/imports/G2pwd_fxye.py

    r2820 r2824  
    4848            if line[0] == '#': continue
    4949            if line[:4] == 'BANK':
    50                 self.dnames.append(fname+' '+''.join(line.split()[:2]))
     50                self.dnames.append(fname+' '+' '.join(line.split()[:2]))
    5151                nBanks += 1
    5252                continue
Note: See TracChangeset for help on using the changeset viewer.