Changeset 2703


Ignore:
Timestamp:
Feb 14, 2017 9:52:37 AM (5 years ago)
Author:
vondreele
Message:

fix problem with default Sample parms for lab data default selection

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2702 r2703  
    13451345                rd.instfile = ''
    13461346                if 'lab data' in choices[res]:
    1347                     rd.Sample['Type'] = 'Bragg-Brentano'
     1347                    rd.Sample.update({'Type':'Bragg-Brentano','Shift':[0.,False],'Transparency':[0.,False],
     1348                        'SurfRoughA':[0.,False],'SurfRoughB':[0.,False]})
    13481349                else:
    1349                     rd.Sample['Type'] = 'Debye-Scherrer'
     1350                    rd.Sample.update({'Type':'Debye-Scherrer','Absorption':[0.,False],'DisplaceX':[0.,False],
     1351                        'DisplaceY':[0.,False]})
    13501352                if 'Generic' in choices[res]:
    13511353                    dlg = G2G.MultiFloatDialog(self,title='Generic TOF detector bank',
  • trunk/GSASIIIO.py

    r2701 r2703  
    908908            if nOcc:
    909909                Aname += '(%d)'%(nOcc)
    910         Sample = G2pdG.SetDefaultSample()
     910        Sample = G2pdG.SetDefaultSample()       #set as Debye-Scherrer
    911911        Sample['Gonio. radius'] = data['distance']
    912912        Sample['Omega'] = data['GonioAngles'][0]
  • trunk/GSASIIpwdGUI.py

    r2701 r2703  
    147147
    148148def SetDefaultSample():
    149     'Fills in default items for the Sample dictionary'
     149    'Fills in default items for the Sample dictionary for Debye-Scherrer & SASD'
    150150    return {
    151151        'InstrName':'',
Note: See TracChangeset for help on using the changeset viewer.