Changeset 2357


Ignore:
Timestamp:
Jul 1, 2016 2:07:22 PM (5 years ago)
Author:
vondreele
Message:

remove import .Pnn file
cleanup CalcRDF

Location:
trunk
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r2356 r2357  
    349349    if 'C' in inst['Type'][0]:
    350350        Tth = pwddata[0]
    351         hc = 12.397639
    352351        wave = G2mth.getWave(inst)
    353         keV = hc/wave
    354352        minQ = npT2q(Tth[0],wave)
    355353        maxQ = npT2q(Tth[-1],wave)
    356354        powQ = npT2q(Tth,wave) 
    357        
    358 
    359355    elif 'T' in inst['Type'][0]:
    360356        TOF = pwddata[0]
     
    363359        maxQ = 2.*np.pi*difC/TOF[0]
    364360        powQ = 2.*np.pi*difC/TOF
    365        
    366 #UseObsCalc? = True for obs-calc; False for obs & calc separate plots
    367361    piDQ = np.pi/(maxQ-minQ)
    368362    Qpoints = np.linspace(minQ,maxQ,len(pwddata[0]),endpoint=True)
     
    372366        Qdata = si.griddata(powQ,pwddata[1],Qpoints,method=RDFcontrols['Smooth'],fill_value=pwddata[1][0])
    373367    Qdata *= np.sin((Qpoints-minQ)*piDQ)/piDQ
    374 #    auxPlot.append([Qpoints,Qdata,'interp1d:'+RDFcontrols['Smooth']])
     368    Qdata *= 0.5*np.sqrt(Qpoints)       #Qbin normalization
     369    auxPlot.append([Qpoints,Qdata,'interp1d:'+RDFcontrols['Smooth']])
    375370#    GSASIIpath.IPyBreak()
    376371    dq = Qpoints[1]-Qpoints[0]
  • trunk/imports

    • Property svn:ignore set to
      G2pwd_Pnn.py
Note: See TracChangeset for help on using the changeset viewer.