Skip to content

Commit

Permalink
Merge branch 'main' of github.com:rs-station/laue-dials
Browse files Browse the repository at this point in the history
  • Loading branch information
PrinceWalnut committed Feb 7, 2024
2 parents a621a3f + 3458479 commit 4491caf
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-docstring-first
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 23.1.0
rev: 24.1.1
hooks:
- id: black
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Setup file for laue_dials.
Use setup.cfg to configure.
"""

from setuptools import setup

if __name__ == "__main__":
Expand Down
1 change: 1 addition & 0 deletions src/laue_dials/algorithms/outliers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Outlier rejection functions.
"""

import numpy as np
import scipy
from dials.array_family import flex
Expand Down
3 changes: 2 additions & 1 deletion src/laue_dials/command_line/integrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
from cctbx import sgtbx
from dials.array_family import flex
from dials.util import show_mail_handle_errors
from dials.util.options import ArgumentParser, reflections_and_experiments_from_files
from dials.util.options import (ArgumentParser,
reflections_and_experiments_from_files)

from laue_dials.algorithms.integration import SegmentedImage
from laue_dials.utils.version import laue_version
Expand Down
7 changes: 2 additions & 5 deletions src/laue_dials/command_line/refine.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
from dxtbx.model import ExperimentList
from dxtbx.model.experiment_list import ExperimentListFactory

from laue_dials.algorithms.laue import (
gen_beam_models,
remove_beam_models,
store_wavelengths,
)
from laue_dials.algorithms.laue import (gen_beam_models, remove_beam_models,
store_wavelengths)
from laue_dials.utils.version import laue_version

# Print laue-dials + DIALS versions
Expand Down

0 comments on commit 4491caf

Please sign in to comment.