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
51a7d4b7
Commit
51a7d4b7
authored
11 months ago
by
Egor Sobolev
Committed by
Philipp Schmidt
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Update ShimadzuHPVX2 conditions, add copy_keys in ShimadzuHPVX2 detector
parent
8b07d324
No related branches found
No related tags found
1 merge request
!939
[Generic][Shimadzu] Dynamic flat-field characterization and correction for MHz microscopy
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/cal_tools/calcat_interface2.py
+10
-0
10 additions, 0 deletions
src/cal_tools/calcat_interface2.py
src/cal_tools/shimadzu.py
+11
-11
11 additions, 11 deletions
src/cal_tools/shimadzu.py
with
21 additions
and
11 deletions
src/cal_tools/calcat_interface2.py
+
10
−
0
View file @
51a7d4b7
...
...
@@ -837,3 +837,13 @@ class DSSCConditions(ConditionsBase):
"
Offset
"
:
_params
,
"
Noise
"
:
_params
,
}
@dataclass
class
ShimadzuHPVX2Conditions
(
ConditionsBase
):
burst_frame_count
:
float
calibration_types
=
{
'
Offset
'
:
[
'
Burst Frame Count
'
],
'
DynamicFF
'
:
[
'
Burst Frame Count
'
],
}
This diff is collapsed.
Click to expand it.
src/cal_tools/shimadzu.py
+
11
−
11
View file @
51a7d4b7
from
dataclasses
import
dataclass
from
cal_tools.calcat_interface2
import
ConditionsBase
@dataclass
class
ShimadzuHPVX2Conditions
(
ConditionsBase
):
frame_size
:
float
calibration_types
=
{
"
Offset
"
:
[
"
Frame Size
"
],
"
DynamicFF
"
:
[
"
Frame Size
"
],
}
from
cal_tools.calcat_interface2
import
ShimadzuHPVX2Conditions
class
ShimadzuHPVX2
:
channel
=
"
daqOutput
"
image_key
=
"
data.image.pixels
"
copy_keys
=
[
"
data.image.binning
"
,
"
data.image.dimTypes
"
,
"
data.image.dims
"
,
"
data.image.flipX
"
,
"
data.image.flipY
"
,
"
data.image.roiOffsets
"
,
"
data.image.rotation
"
,
]
def
__init__
(
self
,
source_name_pattern
:
str
,
channel
=
None
,
image_key
=
None
):
self
.
source_name_pattern
=
source_name_pattern
...
...
@@ -38,7 +38,7 @@ class ShimadzuHPVX2:
source_name
=
self
.
instrument_source
(
module
)
keydata
=
dc
[
source_name
,
self
.
image_key
]
num_frames
=
keydata
.
shape
[
-
3
]
return
ShimadzuHPVX2Conditions
(
frame_size
=
num_frames
/
256
)
return
ShimadzuHPVX2Conditions
(
burst_frame_count
=
float
(
num_frames
)
)
def
instrument_source
(
self
,
module
:
int
):
source_name
=
self
.
source_name_pattern
.
format
(
module
)
...
...
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