Skip to content
Snippets Groups Projects

[AGIPD] [Correct Summary] Make use of karabo_id to only load data from that detector

Merged Cyril Danilevski requested to merge fix/255 into master
All threads resolved!

Description

Fixes https://git.xfel.eu/gitlab/detectors/calibration_workshop/issues/225 :

The matching pattern '*/DET/* is too comprehensive, and there's a suggestion to change it to karabo_id + '/DET/*' to only match for the detector in question.
Therefore, all usages of get_trains_data had to be updated to add the karabo_id as a parameter, replacing the unused path='*/DET/*'.

How Has This Been Tested?

This was tested by adding the following in a new cell, which is a distillation of the content of the notebook's cell here:

out_folder = "/gpfs/exfel/d/proc/SPB/202031/p900145/r0881"
sequences = None
nmods = 16
include = '*S00000*' if sequences is None else f'*S{sequences[0]:05d}*'
karabo_id = "SPB_DET_AGIPD1M-1"
tid, corrected = get_trains_data(f'{out_folder}/', 'image.data', include, karabo_id, modules=nmods)

assert tid == 851711810

Types of changes

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

Checklist:

  • My code follows the code style of this project.
  • I have updated the documentation accordingly.

Reviewers

@kamile @ahmedk

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
  • I've added a check to raise a ValueError when no data is available. The aim to highlight this case in the report.

    Sadly, it's a bit hidden in the changelog, so I've added a note.

    Edit: see here

    Edited by Cyril Danilevski
  • added 1 commit

    • 5a2d265a - Remove redundant value check

    Compare with previous version

  • Cyril Danilevski resolved all discussions

    resolved all discussions

  • Very nice, LGTM

  • Thanks! (kinda forgot about this one)

  • mentioned in commit 3e1233e1

  • Cyril Danilevski mentioned in merge request !407 (merged)

    mentioned in merge request !407 (merged)

  • Please register or sign in to reply
    Loading