[Jungfrau][Correct][Dark] New Settings and gain mode enums to read the jungfrau correct parameters.
This MR is corresponding to this issue https://git.xfel.eu/calibration/planning/-/issues/143
Description
As there's a new software version for Jungfrau. These are needed changes to differentiate between old and new RAW data and read the correct gain_setting
and gain_mode
from the RUN source
- Adding new Jungfrau settings and gain mode enums.
- Using enum meta to be able to check, to which enum the run
settings.value
belong. - New
_get_gain_mode_x
functions based on the availability of thegainMode
key. - Updating the dark notebook with the new ENUMs as it validates the value for the gain modes of the 3 runs.
- Updating the correction notebook with the extra return from get_gain_mode function.
- New bias voltage key as well in the new software
How Has This Been Tested?
-
To be tested on the reference runs + the new JF version runs.
Relevant Documents (optional)
Types of changes
- New feature (non-breaking change which adds functionality)
Checklist:
Reviewers
Edited by Karim Ahmed
Merge request reports
Activity
Filter activity
added Testing label
added 6 commits
-
06b47ca4...5c5daef0 - 4 commits from branch
master
- 7ff844b9 - New Settings and gain mode enums to read the jungfrau correct parameters
- 9cb2968f - small refactors
-
06b47ca4...5c5daef0 - 4 commits from branch
added 112 commits
-
071cc1b2...a6c9a7ce - 109 commits from branch
master
- 5a931779 - New Settings and gain mode enums to read the jungfrau correct parameters
- 6b735dfa - small refactors
- cd269db5 - fixes after testing against reference runs
Toggle commit list-
071cc1b2...a6c9a7ce - 109 commits from branch
- Resolved by Karim Ahmed
- Resolved by Karim Ahmed
- Resolved by Karim Ahmed
I think I started adding comments prematurely - please don't focus on the details just yet. I'll think some more about what to recommend.
Can I just check a couple of things from your description calibration/planning#143:
- The new values in
CONTROL/.../settings
are equivalent to the old 'dynamicgain' (gain0) and 'dynamichg0' (highgain0) - In the new scheme,
CONTROL/.../settings
is only meaningful ifCONTROL/.../gainMode
is 'dynamic' - The other four values in the new
CONTROL/.../gainMode
field are equivalent to the remaining four values in the old.../settings
(i.e. fixgain1, fixgain2, forceswitchg1, forceswitchg2 -> fixg1, fixg2, forceswitchg1, forceswitchg2) - So overall, there are the same 6 possible options, but now split up into two fields.
Have I followed that right?
Edited by Thomas Kluyver - The new values in
removed Testing label
added Waiting for review label
Please register or sign in to reply