gao/analyseScript
1
0
Fork 0
Code Issues Pull Requests repo.project_board Releases Wiki Activity

Debug

Browse Source
This commit is contained in:
Jianshun Gao 2023-05-08 11:47:35 +02:00
parent 2026a599ce
commit 075be187e4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Analyser/FitAnalyser.py
View File

@ -673,7 +673,18 @@ class FitAnalyser():
return value return value
def _get_fit_full_result_single(self, fitResult, key): 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): def _get_fit_full_result(self, fitResult, params):
func = np.vectorize(self._get_fit_full_result_single) func = np.vectorize(self._get_fit_full_result_single)

2
ToolFunction/ToolFunction.py
View File

@ -42,7 +42,7 @@ def get_h5_file_path(folderpath, maxFileNum=None, filename='*.h5',):
def get_date(): def get_date():
today = date.today() today = date.today()
return today.strftime("%y/%m/%d") return today.strftime("%Y/%m/%d")
def _combine_uncertainty(value, std): def _combine_uncertainty(value, std):