Skip to content
Snippets Groups Projects

[Webservice] Enable two runs detectors

Merged Karim Ahmed requested to merge enable_two_runs_detectors into master

Description

This is the first step in enabling two runs detector in the webservice for the Shimdazu

The optimal and long-term solution would be to query CALCAT and check which operation mode the detector configured to.

How Has This Been Tested?

Tested on xcaltst@max-exfl-cal002

2024-04-02 10:37:23,475 - root - INFO - [webservice.py:452] python -m xfel_calibrate.calibrate agipd DARK --concurrency-par karabo_da --slurm-scheduling 0 --slurm-partition exfel --request-time 2024-04-02T08:37:03.908170+00:00 --slurm-name dark_CALLAB_agipd_202031_p900113_r9985_r9984_r9983 --report-to /gpfs/exfel/d/cal_tst/caldb_store/xfel/reports/CALLAB/HED_DET_AGIPD500K2G/dark/dark_900113_r9985_r9984_r9983_240402_083703_908170 --cal-db-interface tcp://max-exfl-cal002:8015#8044 --db-output --ctrl-source-template {}/MDL/FPGA_COMP --karabo-da AGIPD00 AGIPD01 AGIPD02 AGIPD03 AGIPD04 AGIPD05 AGIPD06 AGIPD07 --karabo-id-control HED_EXP_AGIPD500K2G --receiver-template {}CH0 --bias-voltage 200 --in-folder /gpfs/exfel/exp/CALLAB/202031/p900113/raw --out-folder /gpfs/exfel/u/usr/CALLAB/202031/p900113/dark/runs_9985_9984_9983/HED_DET_AGIPD500K2G --karabo-id HED_DET_AGIPD500K2G --operation-mode ADAPTIVE_GAIN --run-high 9985 --run-med 9984 --run-low 9983
2024-04-02 10:37:23,475 - root - INFO - [webservice.py:451] SUCCESS: Started dark characterization: proposal 900113, run 9983
2024-04-02 10:37:23,112 - root - INFO - [webservice.py:452] python -m xfel_calibrate.calibrate epix100 DARK --concurrency-par karabo_da --slurm-scheduling 0 --slurm-partition exfel --request-time 2024-04-02T08:36:47.560281+00:00 --slurm-name dark_CALLAB_epix100_202031_p900113_r9988 --report-to /gpfs/exfel/d/cal_tst/caldb_store/xfel/reports/CALLAB/MID_EXP_EPIX-1/dark/dark_900113_r9988_240402_083647_560281 --cal-db-interface tcp://max-exfl-cal002:8015#8044 --db-output --karabo-da EPIX01 --in-folder /gpfs/exfel/exp/CALLAB/202031/p900113/raw --out-folder /gpfs/exfel/u/usr/CALLAB/202031/p900113/dark/runs_9988/MID_EXP_EPIX_1 --karabo-id MID_EXP_EPIX-1 --operation-mode STANDARD_OPERATION --run 9988

Relevant Documents (optional)

Types of changes

  • New feature (non-breaking change which adds functionality)

Checklist:

Reviewers

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
  • Hardcoded aggregators to distinguish detector types. A nightmare! LGTM minus that naming comment.

  • Karim Ahmed added 1 commit

    added 1 commit

    • a0fef7df - Get number of runs using calcat_interface2

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    Compare with previous version

  • Karim Ahmed marked this merge request as ready

    marked this merge request as ready

  • Karim Ahmed changed the description

    changed the description

  • Karim Ahmed added 2 commits

    added 2 commits

    • 5b53b22c - catch CALCATAPIError and create exception classes for two cases in webservice
    • aeb00f40 - add tests for decide_run_parameters

    Compare with previous version

  • Karim Ahmed
  • Karim Ahmed added 1 commit

    added 1 commit

    • b199f2e0 - remove hardconfiged det instances for knowing number of characterization runs

    Compare with previous version

  • Philipp Schmidt
  • Philipp Schmidt
  • Karim Ahmed added 1 commit

    added 1 commit

    • 2a4d1441 - log a warning for a legacy condition

    Compare with previous version

  • Philipp Schmidt mentioned in merge request !939 (merged)

    mentioned in merge request !939 (merged)

  • I will merge this into a custom tag for SPB's beamtime, but leave it unmerged to work on the unresolved thread.

    TODO: Once the Shimadzu part's are in, I need to rebase it on top of trunk and cherry-pick https://git.xfel.eu/calibration/pycalibration/-/commit/7013861c63a0ba012a2e22e3a7c9886b5074abd6c

  • I will merge this into a custom tag for SPB's beamtime, but leave it unmerged to work on the unresolved thread. Moving the last unresolved thread into an issue and merging this for deployment.

    TODO: Once the Shimadzu part's are in, I need to rebase it on top of trunk and cherry-pick 7013861c

    Edited by Philipp Schmidt
  • Philipp Schmidt changed milestone to %3.14.0

    changed milestone to %3.14.0

  • Philipp Schmidt added 38 commits

    added 38 commits

    • 2a4d1441...e2fe9cc2 - 30 commits from branch master
    • fd50b110 - Enable two run detectors for schimadzu
    • e2e44252 - Get number of runs using calcat_interface2
    • 21173e03 - rename get_run_numbers func
    • ca74aab2 - catch CALCATAPIError and create exception classes for two cases in webservice
    • f5cc4a41 - add tests for decide_run_parameters
    • e036c20f - remove hardconfiged det instances for knowing number of characterization runs
    • 3b1a4a16 - log a warning for a legacy condition
    • e648e418 - Switch to make use of extra_calibration_client() rather than get_client()

    Compare with previous version

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