Changeset 4539


Ignore:
Timestamp:
Aug 7, 2020 8:50:02 AM (15 months ago)
Author:
vondreele
Message:

remove commented old/bad code in G2IO
fix Instrument parameters plots for pink patterns

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r4538 r4539  
    851851    Azms = np.zeros(data['outAzimuths'])
    852852    dazm = 0.
    853 #    if data['fullIntegrate'] and data['outAzimuths'] == 1:
    854 #        Azms = [0.0,]                              #a poor man's average?
    855 #    else:
    856 ##        for i,azm in enumerate(azms[:-1]):
    857 ##            if azm > 360. and azms[i+1] > 360.:
    858 ##                Azms.append(G2img.meanAzm(azm%360.,azms[i+1]%360.))
    859 ##            else:   
    860 ##                Azms.append(G2img.meanAzm(azm,azms[i+1]))
    861853    if data['outAzimuths'] > 1:
    862854        dazm = np.min(np.abs(np.diff(azms)))/2.
     
    887879        polariz = data['PolaVal'][0]
    888880        for item in Comments:
    889             # if 'polariz' in item:
    890             #     try:
    891             #         polariz = float(item.split('=')[1])
    892             #     except:
    893             #         polariz = 0.99
    894881            for key in ('Temperature','Pressure','Time','FreePrm1','FreePrm2','FreePrm3','Omega',
    895882                'Chi','Phi'):
  • trunk/GSASIIplot.py

    r4538 r4539  
    56355635        Plot.legend(loc='best')
    56365636    else:       #'C' & 'B'
     5637        isig = 4
     5638        igam = 6
     5639        if 'B' in Parms['Type'][0]:
     5640            isig = 8
     5641            igam = 10
    56375642        Plot.figure.suptitle(TreeItemText)
    56385643        Plot.set_title('Instrument and sample peak widths')
     
    56445649        Z = np.ones_like(X)
    56455650        data = G2mth.setPeakparms(Parms,Parms2,X,Z)
    5646         s = np.sqrt(data[4])*np.pi/18000.   #var -> sig(radians)
    5647         g = data[6]*np.pi/18000.    #centideg -> radians
     5651        s = np.sqrt(data[isig])*np.pi/18000.   #var -> sig(radians)
     5652        g = data[igam]*np.pi/18000.    #centideg -> radians
    56485653        G = G2pwd.getgamFW(g,s)     #/2.  #delt-theta from TCH fxn
    56495654        Y = sq8ln2*s/nptand(X/2.)
     
    56555660       
    56565661        fit = G2mth.setPeakparms(Parms,Parms2,X,Z,useFit=True)
    5657         sf = np.sqrt(fit[4])*np.pi/18000.
    5658         gf = fit[6]*np.pi/18000.
     5662        sf = np.sqrt(fit[isig])*np.pi/18000.
     5663        gf = fit[igam]*np.pi/18000.
    56595664        Gf = G2pwd.getgamFW(gf,sf)      #/2.
    56605665        Yf = sq8ln2*sf/nptand(X/2.)
Note: See TracChangeset for help on using the changeset viewer.