Skip to content

Commit 5c83bcf

Browse files
author
Eric Giguere
committed
Fix flags priority
1 parent c1cb415 commit 5c83bcf

File tree

2 files changed

+9
-1890
lines changed

2 files changed

+9
-1890
lines changed

qutip/core/qobj/_base.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def __init__(
213213
isherm: bool = None,
214214
isunitary: bool = None
215215
):
216-
flags = {}
216+
flags = {"isherm": isherm, "isunitary": isunitary}
217217
if not (isinstance(arg, _data.Data) and isinstance(dims, Dimensions)):
218218
arg, dims, flags = _QobjBuilder._initialize_data(arg, dims, copy)
219219
if isherm is None and flags["isherm"] is not None:
@@ -226,8 +226,14 @@ def __init__(
226226
self._data = arg
227227
self._dims = dims
228228
self._flags = {}
229-
self._flags["isherm"] = isherm or flags.get("isherm", None)
230-
self._flags["isunitary"] = isunitary or flags.get("isunitary", None)
229+
if isherm is not None:
230+
self._flags["isherm"] = isherm
231+
else:
232+
self._flags["isherm"] = flags.get("isherm", None)
233+
if isunitary is not None:
234+
self._flags["isunitary"] = isunitary
235+
else:
236+
self._flags["isunitary"] = flags.get("isunitary", None)
231237

232238
@property
233239
def type(self) -> str:

0 commit comments

Comments
 (0)