Changeset 2788 for trunk/GSASIIimage.py


Ignore:
Timestamp:
Apr 17, 2017 2:12:29 PM (5 years ago)
Author:
vondreele
Message:

make I/Ib floats in ImageCalibrants?.py
fix issue for SASD seq. refinement
fix some issues with SASD image integrations

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r2773 r2788  
    885885    if '2-theta' in data.get('binType','2-theta'):
    886886        lutth = LUtth               
    887     elif 'Q' == data['binType']:
    888         lutth = 4.*np.pi*npsind(LUtth/2.)/data['wavelength']
    889887    elif 'log(q)' in data['binType']:
    890888        lutth = np.log(4.*np.pi*npsind(LUtth/2.)/data['wavelength'])
     889    elif 'q' == data['binType'].lower():
     890        lutth = 4.*np.pi*npsind(LUtth/2.)/data['wavelength']
    891891    dtth = (lutth[1]-lutth[0])/numChans
    892892    muT = data.get('SampleAbs',[0.0,''])[0]
     
    925925            if 'log(q)' in data.get('binType',''):
    926926                tay = np.log(4.*np.pi*npsind(tay/2.)/data['wavelength'])
    927             elif 'Q' == data.get('binType',''):
     927            elif 'q' == data.get('binType','').lower():
    928928                tay = 4.*np.pi*npsind(tay/2.)/data['wavelength']
    929929            t0 = time.time()
     
    941941    if 'log(q)' in data.get('binType',''):
    942942        H2 = 2.*npasind(np.exp(H2)*data['wavelength']/(4.*np.pi))
    943     elif 'Q' == data.get('binType',''):
     943    elif 'q' == data.get('binType','').lower():
    944944        H2 = 2.*npasind(H2*data['wavelength']/(4.*np.pi))
    945945    if Dazm:       
Note: See TracChangeset for help on using the changeset viewer.