wrong basis for logarithm
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge remote-tracking branch 'origin'
Merge pull request #1 from demalhi/master

ISPyB for Biosaxs
cleaner error message when typos in JSON file
added configuration in conf file
Merge branch 'master', remote branch 'origin'
mergin ISPyB plugin in smart merge
plugin "smart merge" regiser to ISPyB
Merge branch 'master', remote branch 'origin'
stupid typo
integration into the smart merge pipeline of ISPyB
more simple locking for semaphores and better reporting
Kdo pour le Noël de Thomas :þ
new backend base "only" on numpy ... for debugging on ID21
Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin/master'
allow testing without beam ... diod current can be null, you just get
a warning !