From 075be187e4579c69765f73b824cc3f27cdf65273 Mon Sep 17 00:00:00 2001 From: Gao Date: Mon, 8 May 2023 11:47:35 +0200 Subject: [PATCH] Debug --- Analyser/FitAnalyser.py | 13 ++++++++++++- ToolFunction/ToolFunction.py | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Analyser/FitAnalyser.py b/Analyser/FitAnalyser.py index 9f48832..860d8dd 100644 --- a/Analyser/FitAnalyser.py +++ b/Analyser/FitAnalyser.py @@ -673,7 +673,18 @@ class FitAnalyser(): return value def _get_fit_full_result_single(self, fitResult, key): - return ufloat(fitResult.params[key].value, fitResult.params[key].stderr) + + if not fitResult.params[key].value is None: + value = fitResult.params[key].value + else: + value = np.nan + + if not fitResult.params[key].stderr is None: + std = fitResult.params[key].stderr + else: + std = np.nan + + return ufloat(value, std) def _get_fit_full_result(self, fitResult, params): func = np.vectorize(self._get_fit_full_result_single) diff --git a/ToolFunction/ToolFunction.py b/ToolFunction/ToolFunction.py index 84bab56..1b518c2 100644 --- a/ToolFunction/ToolFunction.py +++ b/ToolFunction/ToolFunction.py @@ -42,7 +42,7 @@ def get_h5_file_path(folderpath, maxFileNum=None, filename='*.h5',): def get_date(): today = date.today() - return today.strftime("%y/%m/%d") + return today.strftime("%Y/%m/%d") def _combine_uncertainty(value, std):