Merge branch 'master' into 'refine-ipcluster' (1f60aef3) · Commits · calibration / pycalibration · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

pycalibration
- Activity
- Members
- Labels
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

1f60aef3

Commit 1f60aef3 authored 4 years ago by Thomas Kluyver

Downloads
- Plain Diff

Merge branch 'master' into 'refine-ipcluster'

# Conflicts:
#   bin/slurm_calibrate.sh

parents 811cc07f 8230caaa

No related branches found

No related tags found

1 merge request!357Only start ipcluster if the notebook uses cluster_profile

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

bin/slurm_calibrate.sh 1 addition, 1 deletion

bin/slurm_calibrate.sh
cal_tools/cal_tools/tools.py 2 additions, 4 deletions

cal_tools/cal_tools/tools.py
notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb 42 additions, 60 deletions

notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb
requirements.txt 2 additions, 1 deletion

requirements.txt
xfel_calibrate/finalize.py 1 addition, 1 deletion

xfel_calibrate/finalize.py

with 48 additions and 67 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Legal Notice | Contacts