Skip to content
Snippets Groups Projects
Commit 7850aea6 authored by Arnaud HEMMERLE's avatar Arnaud HEMMERLE
Browse files

Solve problem of nan in energy calib.

parent 7fb5a850
No related branches found
No related tags found
No related merge requests found
# Release notes # Release notes
## v3.1.2 ## v3.2.0
- Solve problem of nan in energy calib.
## v3.1.2
- Update LICENCE, CONTRIBUTORS, docs. - Update LICENCE, CONTRIBUTORS, docs.
- GIXS/area_detector: possibility to control the color scale (min, max). - GIXS/area_detector: possibility to control the color scale (min, max).
......
...@@ -471,14 +471,14 @@ def display_widgets_energy_calib(expt): ...@@ -471,14 +471,14 @@ def display_widgets_energy_calib(expt):
# Energy min # Energy min
dw['xas_energy_min'] = iwid.FloatText( dw['xas_energy_min'] = iwid.FloatText(
value=np.round(np.min(data_0d[energydcm_arg]),4), value=np.round(np.nanmin(data_0d[energydcm_arg]),4),
style=style, style=style,
layout=iwid.Layout(width='200px'), layout=iwid.Layout(width='200px'),
description='E min. (keV)') description='E min. (keV)')
# Energy max # Energy max
dw['xas_energy_max'] = iwid.FloatText( dw['xas_energy_max'] = iwid.FloatText(
value=np.round(np.max(data_0d[energydcm_arg]),4), value=np.round(np.nanmax(data_0d[energydcm_arg]),4),
style=style, style=style,
layout=iwid.Layout(width='200px'), layout=iwid.Layout(width='200px'),
description='E max. (keV)') description='E max. (keV)')
......
...@@ -22,7 +22,7 @@ except ModuleNotFoundError: ...@@ -22,7 +22,7 @@ except ModuleNotFoundError:
# Rules for numbering versions # Rules for numbering versions
# vX.Y.Z with X major, Y minor, Z patch. Each new version increments Z (not used if Z=0). # vX.Y.Z with X major, Y minor, Z patch. Each new version increments Z (not used if Z=0).
# If the file Example.ipynb cannot run with the new libraries, increment Y and restart at Z=0. # If the file Example.ipynb cannot run with the new libraries, increment Y and restart at Z=0.
__version__ = 'v3.1.2' __version__ = 'v3.2.0'
# Define the object experiment # Define the object experiment
# It contains all the attributes relevant to the current experiment # It contains all the attributes relevant to the current experiment
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment