Skip to content
Snippets Groups Projects

[MAPPING][DARK][INJECT] PT2 Update injecting functions and Dark notebooks

Merged Karim Ahmed requested to merge feat/v2_mapping_pt2_inject_and_darks into master
All threads resolved!

Summary:

Previously we were using the information about the physical detector units (PDUs) to inject the new generated calibration constant versions (CCVs). With the new detector mapping, PDU will still be used from a different source than the stored device metadata from cal_db_interactive.

db_module is the used term for Physical Detector Unit in pyCalibration. db_module will be retrieved if it was not given through myMDC or calibration_configurations in the nb's 1st Cell.

Then it will be used in sending constants to the database and storing them locally.

  1. I have updated the main pyCalibration wrapper functions @tools.py that are used to inject CCVs
  2. I have also updated the main dark notebooks for all 8 detectors (AGIPD, LPD, DSSC, Epix10K, Epix100, pnCCD, JungFrau, and FastCCD) and AGIPD's PC 3- Added report_path as a new sent metadata.

This merge request is connected to:

  1. https://git.xfel.eu/gitlab/detectors/cal_db_interactive/merge_requests/58
  2. https://git.xfel.eu/gitlab/detectors/cal_db_interactive/merge_requests/59
  3. https://git.xfel.eu/gitlab/detectors/cal_db_interactive/merge_requests/60
  4. https://git.xfel.eu/gitlab/detectors/pycalibration/merge_requests/413

Tests:

  • More tests are in progress

Reviewers:

@danilevc @hammerd @roscar

Note: This MR will be rebased on multiple MR's waiting for review.

Edited by Robert Rosca

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Karim AhmedKarim Ahmed 4 years ago (Feb 10, 2021 5:50pm UTC)

Merge details

  • Changes merged into master with d5898d20 (commits were squashed).
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Robert Rosca
  • Robert Rosca
  • Robert Rosca
  • Robert Rosca
  • Robert Rosca
  • Robert Rosca
  • Robert Rosca
  • Like before I'll look through the notebooks later

  • Karim Ahmed added 14 commits

    added 14 commits

    Compare with previous version

  • Karim Ahmed
  • Karim Ahmed
  • Karim Ahmed
  • Karim Ahmed
  • Karim Ahmed
  • Karim Ahmed
  • DSSC Dark notebook is missing

  • Karim Ahmed
  • Karim Ahmed added 1 commit

    added 1 commit

    • 1aa89037 - fix pnccd conflicts, agipd error and remove unneeded Optional

    Compare with previous version

  • Karim Ahmed added 5 commits

    added 5 commits

    • bda046f3 - Fix unset variables, fix mutable keyword argument
    • 9b6879f7 - Merge branch 'fix/unused-variables' into 'master'
    • 2168cc6f - Introduce "calibration_metadata.yml"
    • 507adb34 - Merge branch 'feat/202' into 'master'
    • ad072f5e - resolve conflicts

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    Compare with previous version

  • Karim Ahmed resolved all discussions

    resolved all discussions

  • Karim Ahmed added 1 commit

    added 1 commit

    • e8417deb - update get_pdu_from_detectors based on MR suggestion

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    • e8417deb - update get_pdu_from_detectors based on MR suggestion

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    • 67afb068 - fixes, updating pnccd gain and updating the requirements

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    Compare with previous version

  • Karim Ahmed changed target branch from feat/v2_mapping_pt1_retrive_and_corrections to master

    changed target branch from feat/v2_mapping_pt1_retrive_and_corrections to master

  • Karim Ahmed
  • Karim Ahmed
  • Karim Ahmed added 9 commits

    added 9 commits

    Compare with previous version

  • Karim Ahmed resolved all discussions

    resolved all discussions

  • Karim Ahmed added 9 commits

    added 9 commits

    Compare with previous version

  • Karim Ahmed added 9 commits

    added 9 commits

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    Compare with previous version

  • Offline LGTM from @danilevc

  • Thank you a lot @danilevc and @hammerd and @roscar for the pain of going through this MR

  • Karim Ahmed mentioned in commit d5898d20

    mentioned in commit d5898d20

  • merged

  • Robert Rosca changed the description

    changed the description

  • Please register or sign in to reply
    Loading