Skip to content

Commit 2ba87e7

Browse files
committed
fix sequential
1 parent a064ad8 commit 2ba87e7

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

PyMieSim/cpp/utils/casting.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,11 @@ namespace Material {
389389
);
390390
}
391391

392-
if (py::isinstance<py::list>(material_object) || py::isinstance<py::tuple>(material_object)) {
392+
if (
393+
py::isinstance<py::list>(material_object) ||
394+
py::isinstance<py::tuple>(material_object) ||
395+
py::isinstance<py::array>(material_object)
396+
) {
393397
py::sequence material_sequence = py::reinterpret_borrow<py::sequence>(material_object);
394398

395399
if (py::len(material_sequence) == 0) {
@@ -449,7 +453,6 @@ namespace Material {
449453
);
450454
}
451455

452-
453456
template <typename MaterialSetType, typename RefractiveIndexType, typename BaseClass, typename ConstantClass>
454457
MaterialSetType create_material_set_from_pyobject(
455458
const py::object& material_object,
@@ -481,7 +484,11 @@ namespace Material {
481484
);
482485
}
483486

484-
if (py::isinstance<py::sequence>(material_object) && !py::isinstance<py::str>(material_object)) {
487+
if (
488+
py::isinstance<py::list>(material_object) ||
489+
py::isinstance<py::tuple>(material_object) ||
490+
py::isinstance<py::array>(material_object)
491+
) {
485492
py::sequence material_sequence = py::reinterpret_borrow<py::sequence>(material_object);
486493

487494
std::vector<std::shared_ptr<BaseClass>> materials;
@@ -524,6 +531,5 @@ namespace Material {
524531
);
525532
}
526533

527-
528534
}
529535
}

tests/validation/test_sequential.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def test_sequential_vs_standard_detector():
109109
numerical_aperture=NA,
110110
cache_numerical_aperture=CACHE_NA,
111111
sampling=SAMPLING,
112-
polarization_filter=0 * ureg.degree
112+
polarization_filter=0 * ureg.degree,
113113
)
114114

115115
setup_standard = Setup(
@@ -146,7 +146,7 @@ def test_sequential_vs_standard_detector():
146146
cache_numerical_aperture=ONES * CACHE_NA,
147147
sampling=[SAMPLING] * SIZE,
148148
polarization_filter=ONES * POLARIZATION_FILTER,
149-
medium=ONES * MEDIUM_PROPERTY,
149+
medium=ONES,
150150
)
151151

152152
setup_sequential = Setup(

0 commit comments

Comments
 (0)