Skip to content

fix(GH2): Avoid getting wrong data sources or including control devices' sources.

Karim Ahmed requested to merge fix/removing_sorting_datasource_list into master

Description

This addresses this issue on sorting receiver names that can match the wrong receiver with the wrong DA.

Two issues are addressed here:

  • Remove unneeded sort
  • Add daqOutput to the receiver names by default to avoid getting ctrl device sources
receiver_template = "RECEIVER{}"
receiver_affixes = [""]
control_template = "CONTROL"

run_dc.select(receiver_names).all_sources
> frozenset({'SPB_50UM_GH2/DET/RECEIVER', 'SPB_50UM_GH2/DET/RECEIVER:daqOutput'})
run_dc.select('SPB_50UM_GH2/DET/RECEIVER').files

> [FileAccess('/gpfs/exfel/exp/SPB/202431/p900463/raw/r0053/RAW-R0053-GH2CTRL00-S00001.h5'),
 FileAccess('/gpfs/exfel/exp/SPB/202431/p900463/raw/r0053/RAW-R0053-GH2CTRL00-S00000.h5')]

Adding daqOutput will lead to removing error prone requirement in adding daqOutput for reciever names

e.g.

  SA2_XTD6_HIREX:
    detector-type: Gotthard2
    karabo-da:
    - GH200/1
    - GH200/2
    receiver-affixes:
    - _MASTER:daqOutput
    - _SLAVE:daqOutput
    receiver-template: GOTTHARD2{}
    control-template: GOTTHARD2_CTRL
  SPB_50UM_GH2:
    detector-type: Gotthard2
    karabo-da:
    - GH201
    receiver-affixes:
    - :daqOutput

How Has This Been Tested?

Relevant Documents (optional)

The report with the failed dark

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • Update calibration configurations while deploying.

Reviewers

@schmidtp @kluyvert

Edited by Karim Ahmed

Merge request reports