From cc84d32d8ac5fc11f01f1c9444c21823accf1c12 Mon Sep 17 00:00:00 2001
From: Tomas Farago <sensej007@email.cz>
Date: Thu, 12 Nov 2020 15:55:26 +0100
Subject: [PATCH] patch isOnLbsram. Scan could be a str or a TomoscanBase
---
tomwer/core/process/datalistener/datalistener.py | 2 +-
tomwer/core/settings.py | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tomwer/core/process/datalistener/datalistener.py b/tomwer/core/process/datalistener/datalistener.py
index 79e5666057..6c7aa9b365 100644
--- a/tomwer/core/process/datalistener/datalistener.py
+++ b/tomwer/core/process/datalistener/datalistener.py
@@ -73,7 +73,7 @@ class DataListener(SingleProcess):
_output_desc(name='data', type=TomwerScanBase, doc='scan path'),
]
- TIMOUT_READ_FILE = 10
+ TIMOUT_READ_FILE = 40
"When the event 'scan_ended' is received all data might not have been write" \
" yet"
diff --git a/tomwer/core/settings.py b/tomwer/core/settings.py
index aecd4c87ae..fed5697a06 100644
--- a/tomwer/core/settings.py
+++ b/tomwer/core/settings.py
@@ -61,7 +61,10 @@ def isOnLbsram(scan=None):
elif scan is None:
return os.path.isdir(get_lbsram_path())
else:
- return os.path.abspath(scan.path).startswith(__LBSRAM_PATH)
+ if isinstance(scan, str):
+ return os.path.abspath(scan).startswith(__LBSRAM_PATH)
+ else:
+ return os.path.abspath(scan.path).startswith(__LBSRAM_PATH)
def get_lbsram_path():
--
GitLab