From 5a9552f90a64b9ea9529429c12ac40f19464e1fb Mon Sep 17 00:00:00 2001
From: Mauro Rovezzi <mauro.rovezzi@esrf.fr>
Date: Fri, 7 Feb 2025 10:42:50 +0100
Subject: [PATCH] fix bug skip generic read error
---
src/famewoks/__init__.py | 2 +-
src/famewoks/bliss2larch.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/famewoks/__init__.py b/src/famewoks/__init__.py
index 70d4d73..7dcc09c 100644
--- a/src/famewoks/__init__.py
+++ b/src/famewoks/__init__.py
@@ -1,5 +1,5 @@
__author__ = "Mauro Rovezzi"
__email__ = "mauro.rovezzi@esrf.fr"
-__version__ = "25.1.0"
+__version__ = "25.1.1"
__license__ = "GPLv3"
__copyright__ = "2024 -- present, Mauro Rovezzi (CNRS/UGA)"
diff --git a/src/famewoks/bliss2larch.py b/src/famewoks/bliss2larch.py
index 9fc9650..911485b 100644
--- a/src/famewoks/bliss2larch.py
+++ b/src/famewoks/bliss2larch.py
@@ -427,7 +427,7 @@ def load_data(
merge: bool = False,
**kws: Dict[str, Any],
):
- """Load data from disk into the data model (=memory)
+ """Load data from disk into the data model (=memory).
Parameters
----------
@@ -450,6 +450,7 @@ def load_data(
Returns
-------
None
+
"""
cnts = session.counters
cnts_fluo = cnts.fluo_corr if use_fluo_corr else cnts.fluo_roi
@@ -476,7 +477,7 @@ def load_data(
i2 = ds.get_array(i2sig)[iskip:istrip]
fluo0 = ds.get_array(cnts_fluo[0])[iskip:istrip]
stime = ds.get_array(cnts.time)[iskip:istrip]
- except ValueError as err:
+ except Exception as err:
scan.flag = 0
_logger.warning(
f"{infolab}: not loaded and flagged as bad scan -> probably something wrong with this scan?"
--
GitLab