Changeset 1219 for trunk/GSASIIIO.py


Ignore:
Timestamp:
Feb 13, 2014 12:35:01 AM (8 years ago)
Author:
vondreele
Message:

further SASD progress, absorption, transmission, contract calcs & GUI display

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r1217 r1219  
    981981        if 'PWDR' in name:
    982982            parms = ['PXC',data['wavelength'],0.0,0.99,1.0,-0.10,0.4,0.30,1.0,0.0001,Azms[i]]    #set polarization for synchrotron radiation!
    983         elif 'SASD' in name:   
     983        elif 'SASD' in name:
     984            Sample['Trans'] = data['SampleAbs'][0]
    984985            parms = ['LXC',data['wavelength'],0.0,Azms[i]]
    985986        Y = G2frame.Integrate[0][i]
     
    10141015                inst[0][item] = list(inst[0][item])
    10151016            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Instrument Parameters'),inst)
    1016             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample)
    10171017            if 'PWDR' in name:
     1018                G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample)
    10181019                G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Peak List'),[])
    10191020                G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Index Peak List'),[])
     
    10221023            elif 'SASD' in name:             
    10231024                G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Substances'),G2pdG.SetDefaultSubstances())
     1025                G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample)
    10241026                G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Models'),G2pdG.SetDefaultSASDModel())
    10251027            valuesdict = {
Note: See TracChangeset for help on using the changeset viewer.