Changeset 4032 for trunk/GSASIIIO.py


Ignore:
Timestamp:
Jun 19, 2019 4:13:00 PM (2 years ago)
Author:
vondreele
Message:

fix 'Resolution' in old gpx to 'GridStep?'
fix to bad logical operator in MakeFrameMask?
apply polarization pixel by pixel in integration; then put back on for azm=0 for powder diffraction
remove a wasted busycursor
add Xlines & Ylines to masks to mask whole row/columns of pixels (not quite complete)
make picktype = None for unknown picks ('?' causes crash)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r3999 r4032  
    825825        X = 4.*np.pi*npsind(X/2.)/data['wavelength']    #convert to q
    826826    Xminmax = [X[0],X[-1]]
    827     Azms = []
     827    Azms = np.zeros(data['outAzimuths'])
    828828    dazm = 0.
    829     if data['fullIntegrate'] and data['outAzimuths'] == 1:
    830         Azms = [45.0,]                              #a poor man's average?
    831     else:
    832         for i,azm in enumerate(azms[:-1]):
    833             if azm > 360. and azms[i+1] > 360.:
    834                 Azms.append(G2img.meanAzm(azm%360.,azms[i+1]%360.))
    835             else:   
    836                 Azms.append(G2img.meanAzm(azm,azms[i+1]))
     829#    if data['fullIntegrate'] and data['outAzimuths'] == 1:
     830#        Azms = [0.0,]                              #a poor man's average?
     831#    else:
     832##        for i,azm in enumerate(azms[:-1]):
     833##            if azm > 360. and azms[i+1] > 360.:
     834##                Azms.append(G2img.meanAzm(azm%360.,azms[i+1]%360.))
     835##            else:   
     836##                Azms.append(G2img.meanAzm(azm,azms[i+1]))
     837    if data['outAzimuths'] > 1:
    837838        dazm = np.min(np.abs(np.diff(azms)))/2.
    838839    G2frame.IntgOutList = []
Note: See TracChangeset for help on using the changeset viewer.