Changes from BioMAX at MAXIV

mxcube / HardwareObjects

**DEPRECATED**: MXCuBE Hardware Objects (now part of HardwareRepository)

1 stars 11 forks source link

Changes from BioMAX at MAXIV #173

Closed JieNanMAXIV closed 7 years ago

beteva commented 7 years ago

Hello Jie, Could you, please, split your pool request in two, so I can merge the MAXIV part and let the EMBL people merge the rest. Second I think there are some errors in sample_changer/PlateManipulator.py - there are some merge messages.

JieNanMAXIV commented 7 years ago

Hi Antonia, My master branch was quite out of date and there were a lot of conflicts during merging...Those EMBL ones muse be introduced when I tried to solve the merge conflicts "automatically". I think the simplest way is that I close the PR and make a new one instead.