Merge branch 'master', remote branch 'origin'
Merge remote branch 'sparta/master'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge remote branch 'lintaillefer/master'
Merge remote branch 'lintaillefer/master'
Merge remote branch 'lintaillefer/master'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
new URL for ISPyB in biosaxs
configuration specific to slavia where the GPU is much slower than the CPU
Merge remote branch 'sparta/master'
small bugfix for slavia:
- secure the SAS pipeline when input data are not good or parts of the pipeline are failing
- upgrade to the pyFAI parallel azimuthal integration in HPLC mode
Scale by concentration only if non zero
use by default OpenCL for azimuthal integration
Merge remote branch 'origin/master'