Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
JupyLabBook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SIRIUS Beamline
Notebooks
JupyLabBook
Commits
7850aea6
Commit
7850aea6
authored
Feb 29, 2024
by
Arnaud HEMMERLE
Browse files
Options
Downloads
Patches
Plain Diff
Solve problem of nan in energy calib.
parent
7fb5a850
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+3
-1
3 additions, 1 deletion
CHANGELOG.md
lib/frontend/process_widgets/wdata_1d.py
+2
-2
2 additions, 2 deletions
lib/frontend/process_widgets/wdata_1d.py
lib/jupylabbook.py
+1
-1
1 addition, 1 deletion
lib/jupylabbook.py
with
6 additions
and
4 deletions
CHANGELOG.md
+
3
−
1
View file @
7850aea6
# 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).
...
...
This diff is collapsed.
Click to expand it.
lib/frontend/process_widgets/wdata_1d.py
+
2
−
2
View file @
7850aea6
...
@@ -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
.
nan
min
(
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
.
nan
max
(
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)
'
)
...
...
This diff is collapsed.
Click to expand it.
lib/jupylabbook.py
+
1
−
1
View file @
7850aea6
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment