diff --git a/mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py b/mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py index 310bb967a6..4fe19d06f8 100644 --- a/mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py +++ b/mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py @@ -968,7 +968,7 @@ def _do_imagePolling(self, sleep_time): # image.setOffset(QPoint(300,300)) # self.image = QPixmap.fromImage(image) self.image = QPixmap.fromImage( - image.scaled(self.display_width, self.display_height) + image.scaled(int(self.display_width), int(self.display_height)) ) self.emit("imageReceived", self.image) # gevent.sleep(0.1) diff --git a/mxcubecore/HardwareObjects/DESY/P11Collect.py b/mxcubecore/HardwareObjects/DESY/P11Collect.py index a0816eab32..b563994bbc 100644 --- a/mxcubecore/HardwareObjects/DESY/P11Collect.py +++ b/mxcubecore/HardwareObjects/DESY/P11Collect.py @@ -128,6 +128,10 @@ def data_collection_hook(self): "P11Collect. - object initialization failed. COLLECTION not possible" ) + osc_pars["kappa"]=0 + osc_pars["kappa_phi"]=0 + + self.diffr = HWR.beamline.diffractometer detector = HWR.beamline.detector