Changeset 4089 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Aug 12, 2019 12:54:02 PM (2 years ago)
Author:
vondreele
Message:

implement an "absent" list for image calibrants - especially Silicon SRM640

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r4056 r4089  
    586586        G2fil.G2Print('Warning: %s not in local copy of image calibrants file'%data['calibrant'])
    587587        return []
    588     Bravais,SGs,Cells = calFile.Calibrants[data['calibrant']][:3]
     588    calibrant = calFile.Calibrants[data['calibrant']]
     589    Bravais,SGs,Cells = calibrant[:3]
    589590    HKL = []
    590591    for bravais,sg,cell in zip(Bravais,SGs,Cells):
     
    597598            hkl = G2lat.GenHBravais(dmin,bravais,A)
    598599            HKL += list(hkl)
     600    if len(calibrant) > 4:
     601        absent = calibrant[5]
     602    else:
     603        absent = ()
    599604    HKL = G2lat.sortHKLd(HKL,True,False)
    600605    varyList = [item for item in data['varyList'] if data['varyList'][item]]
     
    609614        tam = ma.mask_or(tam,MakeFrameMask(data,frame))
    610615    for iH,H in enumerate(HKL):
     616        if iH in absent:
     617            continue
    611618        if debug:   print (H)
    612619        dsp = H[3]
     
    709716    dmin = data['calibdmin']
    710717#generate reflection set
    711     Bravais,SGs,Cells = calFile.Calibrants[data['calibrant']][:3]
     718    calibrant = calFile.Calibrants[data['calibrant']]
     719    Bravais,SGs,Cells = calibrant[:3]
    712720    HKL = []
    713721    for bravais,sg,cell in zip(Bravais,SGs,Cells):
Note: See TracChangeset for help on using the changeset viewer.