Skip to content

Fix energy loss function #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
casesyh wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix energy loss function #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1795c6
delete the factor of 1000 in Kr energy line
casesyh Aug 26, 2020
9630d62
fix energy_loss_function
casesyh Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions mermithid/misc/ComplexLineShapeUtilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,12 @@ def aseev_func_tail(energy_loss_array, gas_type):

#convert oscillator strength into energy loss spectrum
def get_eloss_spec(e_loss, oscillator_strength, kr_17keV_line): #energies in eV
kinetic_en = kr_17keV_line * 1000
kinetic_en = kr_17keV_line
e_rydberg = 13.605693009 #rydberg energy (eV)
a0 = 5.291772e-11 #bohr radius
return np.where(e_loss>0 , 4.*np.pi*a0**2 * e_rydberg / (kinetic_en * e_loss) * oscillator_strength * np.log(4. * kinetic_en * e_loss / (e_rydberg**3.) ), 0)
# https://3.basecamp.com/3700981/buckets/3107037/documents/2224089016 Eq. (3)
# The scaling factor at the front are omitted since a normalization would be in later step.
return np.where(e_loss>0 , 1. / (e_loss) * oscillator_strength * np.log(4. * kinetic_en * e_rydberg / (e_loss**2.) ), 0)

# Takes only the nonzero bins of a histogram
def get_only_nonzero_bins(bins,hist):
Expand Down