Skip to content
Snippets Groups Projects

[EXtra-data] Disable _use_voview to be able to use .files

Merged Karim Ahmed requested to merge fix/Update_extra_data_version into master
All threads resolved!

With the multiple changes in extra-data after version 1.9.1 . A test was done to validate that pycalibration works fine and a needed change for using DataCollection.files was needed after the virtual_overview_version was introduced in extra-data.

Description

With latest changes in Extra-data using DataCollection.files is not guaranteed to show the files for the selected sources. The .files method was used in some correction notebooks and AGIPD dark to get a list of the files for the selected sources.

A solution would be to avoid using this method and glob the files in the folder as was done before or avoid matching and disable the virtual_overview_version from the RunDirectory function when used.

The latter solution is introduced in the MR along with the update for extra-data version.

How Has This Been Tested?

Using the automated testing https://git.xfel.eu/detectors/pycalibration/-/merge_requests/610 on all reference runs.

Relevant Documents (optional)

Types of changes

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

Checklist:

  • My code follows the code style of this project

Reviewers

@kluyvert @schmidtp

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
  • Karim Ahmed changed title from _uscancel e_voview to be able e to use .files to Disable _use_voview to be able e to use .files

    changed title from _uscancel e_voview to be able e to use .files to Disable _use_voview to be able e to use .files

  • Karim Ahmed changed title from Disable _use_voview to be able e to use .files to Disable _use_voview to be able to use .files

    changed title from Disable _use_voview to be able e to use .files to Disable _use_voview to be able to use .files

  • Karim Ahmed changed title from Disable _use_voview to be able to use .files to [Extra-data] Disable _use_voview to be able to use .files

    changed title from Disable _use_voview to be able to use .files to [Extra-data] Disable _use_voview to be able to use .files

  • Karim Ahmed changed title from [Extra-data] Disable _use_voview to be able to use .files to [EXtra-data] Disable _use_voview to be able to use .files

    changed title from [Extra-data] Disable _use_voview to be able to use .files to [EXtra-data] Disable _use_voview to be able to use .files

  • Thomas Kluyver
  • This basically LGTM. I think there are a couple more places we might be able to adjust the code to avoid needing this, but it's not particularly important.

  • Karim Ahmed added 1 commit

    added 1 commit

    • 538b9709 - lose .files from AGIPD dark and FF

    Compare with previous version

  • Karim Ahmed added 1 commit

    added 1 commit

    • 3efa5fce - lose .files from AGIPD dark and FF

    Compare with previous version

  • Karim Ahmed resolved all threads

    resolved all threads

  • Karim Ahmed added 6 commits

    added 6 commits

    Compare with previous version

  • Thank you @kluyvert

    Merging by today if there are no more comments

  • Karim Ahmed resolved all threads

    resolved all threads

  • merged

  • Karim Ahmed mentioned in commit 6d5a02b4

    mentioned in commit 6d5a02b4

  • Karim Ahmed changed milestone to %3.6.0

    changed milestone to %3.6.0

  • Please register or sign in to reply
    Loading