Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycalibration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
calibration
pycalibration
Commits
2f501f14
Commit
2f501f14
authored
1 year ago
by
Thomas Kluyver
Browse files
Options
Downloads
Patches
Plain Diff
Some fixes
parent
3529fbec
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!885
Revised CalCat API
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cal_tools/calcat_interface2.py
+2
-2
2 additions, 2 deletions
src/cal_tools/calcat_interface2.py
tests/test_calcat_interface2.py
+2
-1
2 additions, 1 deletion
tests/test_calcat_interface2.py
with
4 additions
and
3 deletions
src/cal_tools/calcat_interface2.py
+
2
−
2
View file @
2f501f14
...
@@ -130,7 +130,7 @@ class CalibrationData(Mapping):
...
@@ -130,7 +130,7 @@ class CalibrationData(Mapping):
cal_id_map
=
{
cal_id_map
=
{
api
.
calibration_id
(
calibration
):
calibration
api
.
calibration_id
(
calibration
):
calibration
for
calibration
in
cal
ibration
s
for
calibration
in
cal
_type
s
}
}
calibration_ids
=
list
(
cal_id_map
.
keys
())
calibration_ids
=
list
(
cal_id_map
.
keys
())
...
@@ -153,7 +153,7 @@ class CalibrationData(Mapping):
...
@@ -153,7 +153,7 @@ class CalibrationData(Mapping):
res
=
cls
(
d
)
res
=
cls
(
d
)
if
modules
:
if
modules
:
res
=
res
.
select_modules
(
modules
)
res
=
res
.
select_modules
(
*
modules
)
return
res
return
res
@classmethod
@classmethod
...
...
This diff is collapsed.
Click to expand it.
tests/test_calcat_interface2.py
+
2
−
1
View file @
2f501f14
...
@@ -20,9 +20,10 @@ def test_AGIPD_CalibrationData_metadata():
...
@@ -20,9 +20,10 @@ def test_AGIPD_CalibrationData_metadata():
)
)
agipd_cd
=
CalibrationData
.
from_condition
(
agipd_cd
=
CalibrationData
.
from_condition
(
cond
,
cond
,
"
SPB
_DET_AGIPD1M-1
"
,
"
MID
_DET_AGIPD1M-1
"
,
event_at
=
"
2022-09-01 13:26:48.00
"
,
event_at
=
"
2022-09-01 13:26:48.00
"
,
modules
=
[
'
AGIPD00
'
],
modules
=
[
'
AGIPD00
'
],
calibrations
=
[
'
Offset
'
,
'
SlopesFF
'
],
)
)
assert
'
Offset
'
in
agipd_cd
assert
'
Offset
'
in
agipd_cd
assert
set
(
agipd_cd
[
'
Offset
'
].
constants
)
==
{
'
AGIPD00
'
}
assert
set
(
agipd_cd
[
'
Offset
'
].
constants
)
==
{
'
AGIPD00
'
}
...
...
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