Changeset 1776 for trunk/GSASII.py


Ignore:
Timestamp:
Apr 4, 2015 7:31:34 PM (7 years ago)
Author:
vondreele
Message:

remove Copy, Copy flags buttons from Data display; add them as menu items under edit
Clean up DDataGUI
use the IRAD value on the old IPARM file to set teh x-ray source, e.g. CuKa?
fix SC extinction - now more closely matches old GSAS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1773 r1776  
    990990            Create and return the contents of the instrument parameter tree entry.
    991991            '''
     992            Irads = {0:' ',1:'CrKa',2:'FeKa',3:'CuKa',4:'MoKa',5:'AgKa',6:'TiKa',7:'CoKa'}
    992993            DataType = Iparm['INS   HTYPE '].strip()[:3]  # take 1st 3 chars
    993994            # override inst values with values read from data file
     
    996997            data = [DataType,]
    997998            instname = Iparm.get('INS  1INAME ')
     999            irad = int(Iparm.get('INS  1 IRAD ','0'))
    9981000            if instname:
    9991001                rd.Sample['InstrName'] = instname.strip()
     
    10401042                        data.extend([0.0,0.0,0.002,azm])                                      #OK defaults if fxn #3 not 1st in iprm file
    10411043                codes.extend([0,0,0,0,0,0,0])
    1042                 return [G2IO.makeInstDict(names,data,codes),{}]
     1044                Iparm1 = G2IO.makeInstDict(names,data,codes)
     1045                Iparm1['Source'] = [Irads[irad],Irads[irad]]
     1046                return [Iparm1,{}]
    10431047            elif 'T' in DataType:
    10441048                names = ['Type','fltPath','2-theta','difC','difA', 'difB','Zero','alpha','beta-0','beta-1',
Note: See TracChangeset for help on using the changeset viewer.