Skip to content

Commit 37fd399

Browse files
committed
Make symmetry optional in calculate_structure_factor
1 parent 6d0172a commit 37fd399

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

diffsims/crystallography/reciprocal_lattice_vector.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,10 @@ def allowed(self):
643643
# ------------------------- Custom methods ----------------------- #
644644

645645
def calculate_structure_factor(
646-
self, scattering_params="xtables", debye_waller_factors=None
646+
self,
647+
scattering_params="xtables",
648+
debye_waller_factors=None,
649+
use_symmetry=True,
647650
):
648651
r"""Populate :attr:`structure_factor` with the complex
649652
kinematical structure factor :math:`F_{hkl}` for each vector.
@@ -655,6 +658,9 @@ def calculate_structure_factor(
655658
(default) or ``"lobato"``.
656659
debye_waller_factors: dict
657660
Debye-Waller factors for atoms in the structure.
661+
use_symmetry: bool
662+
If True, will use symmetry to avoid re-calculating structure factors for equivalent reflections.
663+
This can be slower for high symmetries.
658664
659665
Examples
660666
--------
@@ -694,7 +700,7 @@ def calculate_structure_factor(
694700
"""
695701

696702
# Compute one structure factor per set {hkl}
697-
unique, inds = self.unique(use_symmetry=True, return_inverse=True)
703+
unique, inds = self.unique(use_symmetry=use_symmetry, return_inverse=True)
698704
hkl_unique = unique.hkl
699705
structure_factor = _get_kinematical_structure_factor(
700706
structure=self.phase.structure,

diffsims/generators/simulation_generator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def calculate_diffraction2d(
204204
recip.calculate_structure_factor(
205205
scattering_params=self.scattering_params,
206206
debye_waller_factors=debye_waller_factors,
207+
use_symmetry=False, # Usually much faster
207208
)
208209
phase_vectors = []
209210

0 commit comments

Comments
 (0)