Skip to content

Commit 3ffad5a

Browse files
committed
More try/except into lock
1 parent c16e87c commit 3ffad5a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/ess/isissans/mantidio.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,13 @@ def load_run(filename: Filename[RunType], period: Period) -> DataWorkspace[RunTy
105105
# best, 2 is a bit slower but still fast). We can either limit that thread count,
106106
# or add a lock here, which is more specific.
107107
with load_run.lock:
108-
loaded = _mantid_simpleapi.Load(Filename=str(filename), StoreInADS=False)
109-
try:
110-
loaded = _mantid_simpleapi.Load(
111-
Filename=str(filename), LoadMonitors=True, StoreInADS=False
112-
)
113-
except TypeError:
114-
# Not loaded using LoadEventNexus, so LoadMonitor option is not available.
115-
loaded = _mantid_simpleapi.Load(Filename=str(filename), StoreInADS=False)
108+
try:
109+
loaded = _mantid_simpleapi.Load(
110+
Filename=str(filename), LoadMonitors=True, StoreInADS=False
111+
)
112+
except TypeError:
113+
# Not loaded using LoadEventNexus, so LoadMonitor option is not available.
114+
loaded = _mantid_simpleapi.Load(Filename=str(filename), StoreInADS=False)
116115
if isinstance(loaded, _mantid_api.Workspace):
117116
# A single workspace
118117
data_ws = loaded

0 commit comments

Comments
 (0)