File tree Expand file tree Collapse file tree 7 files changed +7
-8
lines changed Expand file tree Collapse file tree 7 files changed +7
-8
lines changed Original file line number Diff line number Diff line change 12
12
from easyscience .Objects .new_variable import Parameter
13
13
from easyscience .Objects .ObjectClasses import BaseObj
14
14
15
- from easyreflectometry .utils import get_as_parameter
16
- from easyreflectometry .utils import yaml_dump
17
15
from easyreflectometry .sample import BaseAssembly
18
16
from easyreflectometry .sample import Sample
17
+ from easyreflectometry .utils import get_as_parameter
18
+ from easyreflectometry .utils import yaml_dump
19
19
20
20
from .resolution_functions import PercentageFhwm
21
21
from .resolution_functions import ResolutionFunction
Original file line number Diff line number Diff line change 6
6
from easyscience .Constraints import FunctionalConstraint
7
7
from easyscience .Objects .new_variable import Parameter
8
8
9
- from easyreflectometry .utils import get_as_parameter
10
9
from easyreflectometry .special .calculations import area_per_molecule_to_scattering_length_density
11
10
from easyreflectometry .special .calculations import neutron_scattering_length
11
+ from easyreflectometry .utils import get_as_parameter
12
12
13
13
from ..materials .material import Material
14
14
from ..materials .material_solvated import DEFAULTS as MATERIAL_SOLVATED_DEFAULTS
Original file line number Diff line number Diff line change 6
6
from easyscience .Constraints import FunctionalConstraint
7
7
from easyscience .Objects .new_variable import Parameter
8
8
9
- from easyreflectometry .utils import get_as_parameter
10
9
from easyreflectometry .special .calculations import density_to_sld
11
10
from easyreflectometry .special .calculations import molecular_weight
12
11
from easyreflectometry .special .calculations import neutron_scattering_length
12
+ from easyreflectometry .utils import get_as_parameter
13
13
14
14
from .material import DEFAULTS as MATERIAL_DEFAULTS
15
15
from .material import Material
Original file line number Diff line number Diff line change 5
5
from easyscience .Constraints import FunctionalConstraint
6
6
from easyscience .Objects .new_variable import Parameter
7
7
8
- from easyreflectometry .utils import get_as_parameter
9
8
from easyreflectometry .special .calculations import weighted_average
9
+ from easyreflectometry .utils import get_as_parameter
10
10
11
11
from ...base_core import BaseCore
12
12
from .material import DEFAULTS as MATERIAL_DEFAULTS
Original file line number Diff line number Diff line change 13
13
from numpy .testing import assert_equal
14
14
15
15
from easyreflectometry .calculators .factory import CalculatorFactory
16
- from easyreflectometry .utils import get_as_parameter
17
16
from easyreflectometry .sample .elements .layers .layer import DEFAULTS
18
17
from easyreflectometry .sample .elements .layers .layer import Layer
19
18
from easyreflectometry .sample .elements .materials .material import Material
19
+ from easyreflectometry .utils import get_as_parameter
20
20
21
21
22
22
class TestLayer (unittest .TestCase ):
Original file line number Diff line number Diff line change 8
8
import numpy as np
9
9
from easyscience import global_object
10
10
11
- from easyreflectometry .utils import get_as_parameter
12
11
from easyreflectometry .sample .elements .materials .material import DEFAULTS
13
12
from easyreflectometry .sample .elements .materials .material import Material
13
+ from easyreflectometry .utils import get_as_parameter
14
14
15
15
16
16
class TestMaterial :
Original file line number Diff line number Diff line change 8
8
from easyscience .fitting import AvailableMinimizers
9
9
from easyscience .Objects .new_variable import Parameter
10
10
from numpy .testing import assert_allclose
11
- from scipp import DataGroup
12
11
13
12
import easyreflectometry
14
13
from easyreflectometry .data import DataSet1D
You can’t perform that action at this time.
0 commit comments