Skip to content

Ignore concurrency options from notebooks.py when --concurrency-par specifies something different

Thomas Kluyver requested to merge concurrency-par-skip-defaults into master

Description

There is interest in trying the AGIPD correction notebook with data split by modules rather than sequences. In principle, specifying --concurrency-par modules --modules 0-16 should suffice for this. However, it will still try to call the balance_sequences function from the notebook, which will do the wrong thing if there are < 16 sequences.

With this change, passing --concurrency-par modules will also ignore the related settings in notebook.py, specifically default concurrency and use function.

How Has This Been Tested?

Run xfel-calibrate with options --concurrency-par modules --modules 0-16. It does appear to get split up by modules rather than by sequences. Output is in /gpfs/exfel/data/scratch/kluyvert/agipd-calib-900201-203-bymodule2/. There are some errors in the logs - I'm still trying to work out if they're related to this.

Types of changes

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

Checklist:

  • My code follows the code style of this project.

Reviewers

@schmidtp @roscar

Edited by Thomas Kluyver

Merge request reports