Skip to content
Snippets Groups Projects

[Jungfrau][Correct][Dark] New Settings and gain mode enums to read the jungfrau correct parameters.

Merged Karim Ahmed requested to merge feat/new_jungfrau_software_changes into master

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

  1. Adding new Jungfrau settings and gain mode enums.
  2. Using enum meta to be able to check, to which enum the run settings.value belong.
  3. New _get_gain_mode_x functions based on the availability of the gainMode key.
  4. Updating the dark notebook with the new ENUMs as it validates the value for the gain modes of the 3 runs.
  5. Updating the correction notebook with the extra return from get_gain_mode function.
  6. 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

@kluyvert @schmidtp @danilevc @mramilli

Edited by Karim Ahmed

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • 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 if CONTROL/.../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
  • removed Testing label

  • Karim Ahmed added 1 commit

    added 1 commit

    • a50d8863 - Correct JungfraSettings enum keys

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading