Skip to content

Commit

Permalink
Changed references to amplus
Browse files Browse the repository at this point in the history
  • Loading branch information
jmp1985 committed Jun 3, 2021
1 parent 776c1b3 commit 091fbea
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
include CMakeLists.txt
recursive-include src *
recursive-include pybind11 *
include amplus/data/files/4v5d.cif
include amplus/data/files/4v1w.cif
include amplus/data/files/3jb9.cif
include amplus/data/files/6qt9.cif
include amplus/data/files/6z6u.pdb
include amplus/data/files/water.cif
include parakeet/data/files/4v5d.cif
include parakeet/data/files/4v1w.cif
include parakeet/data/files/3jb9.cif
include parakeet/data/files/6qt9.cif
include parakeet/data/files/6z6u.pdb
include parakeet/data/files/water.cif
8 changes: 4 additions & 4 deletions src/parakeet/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -956,14 +956,14 @@ def compute_image(psi, microscope, simulation, x_fov, y_fov, offset, device):
# )

# # Compute the fraction of electrons in the plasmon peak
# electron_fraction = amplus.inelastic.mp_loss_fraction(shape, angle)
# electron_fraction = parakeet.inelastic.mp_loss_fraction(shape, angle)
# electron_fraction *= inelastic_fraction

# # Scale the image by the fraction of electrons
# image *= electron_fraction

# Compute the energy and spread of the plasmon peak
# peak, sigma = amplus.inelastic.most_probable_loss(
# peak, sigma = parakeet.inelastic.most_probable_loss(
# microscope.beam.energy, shape, angle
# )
# peak /= 1000.0
Expand Down Expand Up @@ -1034,8 +1034,8 @@ def compute_image(psi, microscope, simulation, x_fov, y_fov, offset, device):

# Compute the zero loss and mpl image fraction
print(shape, angle)
zero_loss_fraction = amplus.inelastic.zero_loss_fraction(shape, angle)
mp_loss_fraction = amplus.inelastic.mp_loss_fraction(shape, angle)
zero_loss_fraction = parakeet.inelastic.zero_loss_fraction(shape, angle)
mp_loss_fraction = parakeet.inelastic.mp_loss_fraction(shape, angle)
electron_fraction = (
elastic_filtered_fraction * zero_loss_fraction
+ inelastic_filtered_fraction * mp_loss_fraction
Expand Down

0 comments on commit 091fbea

Please sign in to comment.