Changeset 272 for trunk/GSASIIpwd.py


Ignore:
Timestamp:
Apr 29, 2011 2:20:30 PM (11 years ago)
Author:
vondreele
Message:

add slider for "Ruland" coeff.
add 'o' option for undoing offset in powder plots

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r271 r272  
    174174    else:
    175175        return 1.0
    176        
     176               
    177177def Ruland(RulCoff,wave,Q,Compton):
    178178    C = 2.9978e8
     
    186186def LorchWeight(Q):
    187187    return np.sin(np.pi*(Q[-1]-Q)/(2.0*Q[-1]))
    188    
    189 def lambdaCompton(DetType,wave,Q):
    190     hmc = 0.024262734687
    191     if 'Image' in DetType:       
    192         return wave*(1.0+2.0*hmc*wave*(Q/(4.0*np.pi))**2)**3
    193     else: 
    194         return wave*(1.0+2.0*hmc*wave*(Q/(4.0*np.pi))**2)**2
    195        
     188           
    196189def GetAsfMean(ElList,Sthl2):
    197190#   Calculate various scattering factor terms for PDF calcs
     
    681674    xydata['IofQ'][1][1] /= Absorb(data['Geometry'],Abs,data['Diam'],Tth)
    682675    xydata['IofQ'][1][1] /= Polarization(inst['Polariz.'],Tth,Azm=inst['Azimuth'])
    683     xydata['IofQ'][1][1] *= Oblique(data['ObliqCoeff'],Tth)
     676    if data['DetType'] == 'Image plate':
     677        xydata['IofQ'][1][1] *= Oblique(data['ObliqCoeff'],Tth)
    684678    XY = xydata['IofQ'][1]   
    685679    #convert to Q
     
    714708#    auxPlot.append([Q,ruland,'Ruland'])     
    715709    CF *= ruland
    716 #    auxPlot.append([Q,CF,'Compton*Ruland'])
     710#    auxPlot.append([Q,CF,'CF-Corr'])
    717711    scale = np.sum((FFSq+CF)[minQ:maxQ])/np.sum(xydata['SofQ'][1][1][minQ:maxQ])
    718712    xydata['SofQ'][1][1] *= scale
Note: See TracChangeset for help on using the changeset viewer.