diff --git a/src/famewoks/__init__.py b/src/famewoks/__init__.py index 70d4d7387b807f3895f74be55a060c861e7426c4..7dcc09c81ab6a4277a25266bd7d91c900692724a 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 9fc9650c47d2d995cea20fd785156b87dbb1c720..911485b7fc10303ee7e5543dee2ef3cde6afde75 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?"