Skip to content

Commit

Permalink
ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
andped10 committed Nov 13, 2024
1 parent d1d0b05 commit 156f7be
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/easyreflectometry/model/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
from easyscience.Objects.new_variable import Parameter
from easyscience.Objects.ObjectClasses import BaseObj

from easyreflectometry.utils import get_as_parameter
from easyreflectometry.utils import yaml_dump
from easyreflectometry.sample import BaseAssembly
from easyreflectometry.sample import Sample
from easyreflectometry.utils import get_as_parameter
from easyreflectometry.utils import yaml_dump

from .resolution_functions import PercentageFhwm
from .resolution_functions import ResolutionFunction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from easyscience.Constraints import FunctionalConstraint
from easyscience.Objects.new_variable import Parameter

from easyreflectometry.utils import get_as_parameter
from easyreflectometry.special.calculations import area_per_molecule_to_scattering_length_density
from easyreflectometry.special.calculations import neutron_scattering_length
from easyreflectometry.utils import get_as_parameter

from ..materials.material import Material
from ..materials.material_solvated import DEFAULTS as MATERIAL_SOLVATED_DEFAULTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
from easyscience.Constraints import FunctionalConstraint
from easyscience.Objects.new_variable import Parameter

from easyreflectometry.utils import get_as_parameter
from easyreflectometry.special.calculations import density_to_sld
from easyreflectometry.special.calculations import molecular_weight
from easyreflectometry.special.calculations import neutron_scattering_length
from easyreflectometry.utils import get_as_parameter

from .material import DEFAULTS as MATERIAL_DEFAULTS
from .material import Material
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from easyscience.Constraints import FunctionalConstraint
from easyscience.Objects.new_variable import Parameter

from easyreflectometry.utils import get_as_parameter
from easyreflectometry.special.calculations import weighted_average
from easyreflectometry.utils import get_as_parameter

from ...base_core import BaseCore
from .material import DEFAULTS as MATERIAL_DEFAULTS
Expand Down
2 changes: 1 addition & 1 deletion tests/sample/elements/layers/test_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
from numpy.testing import assert_equal

from easyreflectometry.calculators.factory import CalculatorFactory
from easyreflectometry.utils import get_as_parameter
from easyreflectometry.sample.elements.layers.layer import DEFAULTS
from easyreflectometry.sample.elements.layers.layer import Layer
from easyreflectometry.sample.elements.materials.material import Material
from easyreflectometry.utils import get_as_parameter


class TestLayer(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/sample/elements/materials/test_material.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import numpy as np
from easyscience import global_object

from easyreflectometry.utils import get_as_parameter
from easyreflectometry.sample.elements.materials.material import DEFAULTS
from easyreflectometry.sample.elements.materials.material import Material
from easyreflectometry.utils import get_as_parameter


class TestMaterial:
Expand Down
1 change: 0 additions & 1 deletion tests/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from easyscience.fitting import AvailableMinimizers
from easyscience.Objects.new_variable import Parameter
from numpy.testing import assert_allclose
from scipp import DataGroup

import easyreflectometry
from easyreflectometry.data import DataSet1D
Expand Down

0 comments on commit 156f7be

Please sign in to comment.