mxcubecore 1.353.0__py3-none-any.whl → 1.355.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- mxcubecore/Command/Sardana.py +0 -1
- mxcubecore/HardwareObjects/ALBA/ALBAAutoProcessing.py +0 -1
- mxcubecore/HardwareObjects/ALBA/ALBABackLight.py +0 -1
- mxcubecore/HardwareObjects/ALBA/ALBADataAnalysis.py +0 -1
- mxcubecore/HardwareObjects/ALBA/ALBAEpsActuator.py +0 -1
- mxcubecore/HardwareObjects/ALBA/ALBAFastShutter.py +0 -2
- mxcubecore/HardwareObjects/ALBA/ALBAFlux.py +0 -1
- mxcubecore/HardwareObjects/ALBA/ALBAFrontEnd.py +0 -5
- mxcubecore/HardwareObjects/ALBA/ALBAMachineInfo.py +0 -9
- mxcubecore/HardwareObjects/ALBA/ALBASupervisor.py +0 -3
- mxcubecore/HardwareObjects/ALBA/ALBATransmission.py +0 -1
- mxcubecore/HardwareObjects/ALBA/XalocMachineInfo.py +0 -9
- mxcubecore/HardwareObjects/ALBA/XalocMiniDiff.py +0 -1
- mxcubecore/HardwareObjects/Attenuators.py +0 -2
- mxcubecore/HardwareObjects/DESY/Centring.py +0 -8
- mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py +0 -2
- mxcubecore/HardwareObjects/DESY/P11BackLight.py +0 -3
- mxcubecore/HardwareObjects/DESY/P11Beam.py +0 -3
- mxcubecore/HardwareObjects/DESY/P11DetectorCover.py +0 -1
- mxcubecore/HardwareObjects/DESY/P11EDNACharacterisation.py +0 -7
- mxcubecore/HardwareObjects/DESY/P11Energy.py +0 -1
- mxcubecore/HardwareObjects/DESY/P11FastShutter.py +0 -3
- mxcubecore/HardwareObjects/DESY/P11MachineInfo.py +0 -1
- mxcubecore/HardwareObjects/DESY/P11Session.py +0 -1
- mxcubecore/HardwareObjects/DESY/P11Shutter.py +0 -2
- mxcubecore/HardwareObjects/DESY/P11Transmission.py +0 -2
- mxcubecore/HardwareObjects/DESY/P11Zoom.py +0 -1
- mxcubecore/HardwareObjects/EMBL/EMBLBeamlineTest.py +0 -10
- mxcubecore/HardwareObjects/EMBL/EMBLBeamstop.py +0 -1
- mxcubecore/HardwareObjects/EMBL/EMBLFlux.py +0 -2
- mxcubecore/HardwareObjects/EMBL/EMBLMiniDiff.py +0 -1
- mxcubecore/HardwareObjects/EMBL/EMBLPiezoMotor.py +0 -2
- mxcubecore/HardwareObjects/EMBL/EMBLSafetyShutter.py +0 -1
- mxcubecore/HardwareObjects/EMBL/EMBLXRFSpectrum.py +0 -2
- mxcubecore/HardwareObjects/EMBL/EMBLXrayImaging.py +0 -1
- mxcubecore/HardwareObjects/EMBL/TINEMotor.py +0 -2
- mxcubecore/HardwareObjects/ESRF/ESRFBeamlineActions.py +0 -3
- mxcubecore/HardwareObjects/ESRF/ESRFEnergyScan.py +0 -4
- mxcubecore/HardwareObjects/ESRF/MD2MultiCollect.py +0 -3
- mxcubecore/HardwareObjects/ESRF/queue_entry/mx_base_queue_entry.py +0 -1
- mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_big_foil_collection.py +0 -1
- mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_chip_collection.py +0 -8
- mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_injector_collection.py +0 -4
- mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_laser_hare_collection.py +0 -2
- mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_laser_injector_collection.py +0 -2
- mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_line_scan_collection.py +0 -1
- mxcubecore/HardwareObjects/ESRF/queue_entry/test_collection.py +0 -6
- mxcubecore/HardwareObjects/GrobMotor.py +0 -1
- mxcubecore/HardwareObjects/LNLS/EPICSActuator.py +0 -1
- mxcubecore/HardwareObjects/LNLS/LNLSBeam.py +0 -1
- mxcubecore/HardwareObjects/LNLS/LNLSCollect.py +0 -2
- mxcubecore/HardwareObjects/LNLS/LNLSZoom.py +0 -2
- mxcubecore/HardwareObjects/Lima2Detector.py +0 -2
- mxcubecore/HardwareObjects/MAXIV/MaxIVSession.py +0 -1
- mxcubecore/HardwareObjects/Marvin.py +0 -1
- mxcubecore/HardwareObjects/MicrodiffInOut.py +0 -1
- mxcubecore/HardwareObjects/MicrodiffLight.py +0 -1
- mxcubecore/HardwareObjects/MotorWPositions.py +0 -1
- mxcubecore/HardwareObjects/PyISPyBClient.py +0 -11
- mxcubecore/HardwareObjects/QtAxisCamera.py +0 -3
- mxcubecore/HardwareObjects/QtGraphicsManager.py +0 -14
- mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Configuration.py +0 -2
- mxcubecore/HardwareObjects/SOLEIL/PX1/PX1DetectorDistance.py +0 -1
- mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Energy.py +0 -2
- mxcubecore/HardwareObjects/SOLEIL/PX1/PX1EnergyScan.py +0 -1
- mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Resolution.py +0 -3
- mxcubecore/HardwareObjects/SOLEIL/PX1/PX1TangoLight.py +0 -3
- mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Collect.py +0 -7
- mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Qt4_LimaVideo.py +0 -15
- mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Resolution.py +0 -3
- mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Video.py +0 -4
- mxcubecore/HardwareObjects/SOLEIL/SOLEILEnergyScan.py +0 -1
- mxcubecore/HardwareObjects/SOLEIL/SOLEILMachineInfo.py +0 -7
- mxcubecore/HardwareObjects/SOLEIL/SOLEILPss.py +0 -1
- mxcubecore/HardwareObjects/SOLEIL/TangoDCMotor.py +0 -2
- mxcubecore/HardwareObjects/abstract/AbstractProcedure.py +0 -5
- mxcubecore/HardwareObjects/abstract/ISPyBAbstractLims.py +0 -1
- mxcubecore/HardwareObjects/mockup/EnergyScanMockup.py +0 -1
- mxcubecore/HardwareObjects/mockup/ExporterNStateMockup.py +0 -1
- mxcubecore/HardwareObjects/mockup/PlateManipulatorMockup.py +0 -2
- mxcubecore/__init__.py +0 -1
- mxcubecore/dispatcher.py +4 -1
- mxcubecore/queue_entry/generic_workflow.py +0 -2
- mxcubecore/queue_entry/optical_centring.py +0 -2
- mxcubecore/utils/qt_import.py +2 -0
- {mxcubecore-1.353.0.dist-info → mxcubecore-1.355.0.dist-info}/METADATA +1 -1
- {mxcubecore-1.353.0.dist-info → mxcubecore-1.355.0.dist-info}/RECORD +90 -90
- {mxcubecore-1.353.0.dist-info → mxcubecore-1.355.0.dist-info}/COPYING +0 -0
- {mxcubecore-1.353.0.dist-info → mxcubecore-1.355.0.dist-info}/COPYING.LESSER +0 -0
- {mxcubecore-1.353.0.dist-info → mxcubecore-1.355.0.dist-info}/WHEEL +0 -0
|
@@ -11,20 +11,9 @@ import pyispyb_client
|
|
|
11
11
|
from pyispyb_client import Configuration
|
|
12
12
|
from pyispyb_client.apis.tags import (
|
|
13
13
|
authentication_api,
|
|
14
|
-
serial_crystallography_api,
|
|
15
14
|
webservices_serial_crystallography_api,
|
|
16
15
|
)
|
|
17
|
-
from pyispyb_client.model.event_chain_create import EventChainCreate
|
|
18
|
-
from pyispyb_client.model.event_create import EventCreate
|
|
19
16
|
from pyispyb_client.model.login import Login
|
|
20
|
-
from pyispyb_client.model.ssx_crystal_create import SSXCrystalCreate
|
|
21
|
-
from pyispyb_client.model.ssx_data_collection_create import SSXDataCollectionCreate
|
|
22
|
-
from pyispyb_client.model.ssx_data_collection_group_create import (
|
|
23
|
-
SSXDataCollectionGroupCreate,
|
|
24
|
-
)
|
|
25
|
-
from pyispyb_client.model.ssx_protein_create import SSXProteinCreate
|
|
26
|
-
from pyispyb_client.model.ssx_sample_component_create import SSXSampleComponentCreate
|
|
27
|
-
from pyispyb_client.model.ssx_sample_create import SSXSampleCreate
|
|
28
17
|
from typing_extensions import Literal
|
|
29
18
|
|
|
30
19
|
from mxcubecore import HardwareRepository as HWR
|
|
@@ -20,11 +20,8 @@
|
|
|
20
20
|
import base64
|
|
21
21
|
import time
|
|
22
22
|
|
|
23
|
-
import Image
|
|
24
23
|
import numpy as np
|
|
25
24
|
import urllib2
|
|
26
|
-
from cStringIO import StringIO
|
|
27
|
-
from PIL.ImageQt import ImageQt
|
|
28
25
|
|
|
29
26
|
from mxcubecore.HardwareObjects.abstract.AbstractVideoDevice import AbstractVideoDevice
|
|
30
27
|
from mxcubecore.utils import qt_import
|
|
@@ -41,12 +41,6 @@ from __future__ import print_function
|
|
|
41
41
|
import logging
|
|
42
42
|
import math
|
|
43
43
|
import os
|
|
44
|
-
|
|
45
|
-
try:
|
|
46
|
-
import cPickle as pickle
|
|
47
|
-
except Exception:
|
|
48
|
-
import _pickle as pickle
|
|
49
|
-
|
|
50
44
|
from copy import deepcopy
|
|
51
45
|
from datetime import datetime
|
|
52
46
|
|
|
@@ -60,14 +54,6 @@ from scipy import (
|
|
|
60
54
|
signal,
|
|
61
55
|
)
|
|
62
56
|
|
|
63
|
-
try:
|
|
64
|
-
import lucid2 as lucid
|
|
65
|
-
except ImportError:
|
|
66
|
-
try:
|
|
67
|
-
import lucid
|
|
68
|
-
except ImportError:
|
|
69
|
-
pass
|
|
70
|
-
|
|
71
57
|
from mxcubecore import HardwareRepository as HWR
|
|
72
58
|
from mxcubecore.HardwareObjects import QtGraphicsLib as GraphicsLib
|
|
73
59
|
from mxcubecore.HardwareObjects.abstract.AbstractSampleView import AbstractSampleView
|
|
@@ -25,7 +25,6 @@ from matplotlib.figure import Figure
|
|
|
25
25
|
from xabs_lib import McMaster
|
|
26
26
|
|
|
27
27
|
from mxcubecore import HardwareRepository as HWR
|
|
28
|
-
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
29
28
|
from mxcubecore.Command.Tango import DeviceProxy
|
|
30
29
|
from mxcubecore.TaskUtils import (
|
|
31
30
|
cleanup,
|
|
@@ -17,22 +17,15 @@
|
|
|
17
17
|
# along with MXCuBE. If not, see <http://www.gnu.org/licenses/>.
|
|
18
18
|
|
|
19
19
|
import logging
|
|
20
|
-
import os
|
|
21
20
|
|
|
22
21
|
import gevent
|
|
23
|
-
from energy_scan import energy_scan
|
|
24
|
-
from film import film
|
|
25
|
-
from fluorescence_spectrum import fluorescence_spectrum
|
|
26
22
|
from helical_scan import helical_scan
|
|
27
|
-
from inverse_scan import inverse_scan
|
|
28
|
-
from nested_helical_acquisition import nested_helical_acquisition
|
|
29
23
|
from omega_scan import omega_scan
|
|
30
24
|
|
|
31
25
|
# from xray_centring import xray_centring
|
|
32
26
|
from raster_scan import raster_scan
|
|
33
27
|
from reference_images import reference_images
|
|
34
28
|
from slits import slits1
|
|
35
|
-
from tomography import tomography
|
|
36
29
|
|
|
37
30
|
from mxcubecore import HardwareRepository as HWR
|
|
38
31
|
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
@@ -44,11 +44,6 @@ Example Hardware Object XML file :
|
|
|
44
44
|
</object>
|
|
45
45
|
"""
|
|
46
46
|
|
|
47
|
-
import logging
|
|
48
|
-
import os
|
|
49
|
-
import struct
|
|
50
|
-
import time
|
|
51
|
-
|
|
52
47
|
from mxcubecore.HardwareObjects.QtLimaVideo import QtLimaVideo
|
|
53
48
|
|
|
54
49
|
try:
|
|
@@ -56,16 +51,6 @@ try:
|
|
|
56
51
|
except Exception:
|
|
57
52
|
pass
|
|
58
53
|
|
|
59
|
-
try:
|
|
60
|
-
from Lima import Prosilica
|
|
61
|
-
except ImportError as e:
|
|
62
|
-
pass
|
|
63
|
-
|
|
64
|
-
try:
|
|
65
|
-
from Lima import Basler
|
|
66
|
-
except ImportError as e:
|
|
67
|
-
pass
|
|
68
|
-
|
|
69
54
|
|
|
70
55
|
class PX2Qt4_LimaVideo(QtLimaVideo):
|
|
71
56
|
default_exposure_time = 0.5
|
|
@@ -63,13 +63,6 @@ Example Hardware Object XML file :
|
|
|
63
63
|
import logging
|
|
64
64
|
import os
|
|
65
65
|
import time
|
|
66
|
-
from datetime import (
|
|
67
|
-
datetime,
|
|
68
|
-
timedelta,
|
|
69
|
-
)
|
|
70
|
-
|
|
71
|
-
from gevent import spawn
|
|
72
|
-
from urllib2 import urlopen
|
|
73
66
|
|
|
74
67
|
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
75
68
|
|
|
@@ -27,11 +27,6 @@ import gevent.event
|
|
|
27
27
|
# Using jsonschma for validating the JSCONSchemas
|
|
28
28
|
# https://json-schema.org/
|
|
29
29
|
# https://github.com/Julian/jsonschema
|
|
30
|
-
from jsonschema import (
|
|
31
|
-
ValidationError,
|
|
32
|
-
validate,
|
|
33
|
-
)
|
|
34
|
-
|
|
35
30
|
from mxcubecore.BaseHardwareObjects import ConfiguredObject
|
|
36
31
|
from mxcubecore.dispatcher import dispatcher
|
|
37
32
|
|
|
@@ -8,7 +8,6 @@ from matplotlib.backends.backend_agg import FigureCanvasAgg
|
|
|
8
8
|
from matplotlib.figure import Figure
|
|
9
9
|
|
|
10
10
|
from mxcubecore import HardwareRepository as HWR
|
|
11
|
-
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
12
11
|
from mxcubecore.HardwareObjects.abstract.AbstractEnergyScan import AbstractEnergyScan
|
|
13
12
|
from mxcubecore.TaskUtils import cleanup
|
|
14
13
|
|
|
@@ -33,7 +33,6 @@ from enum import Enum
|
|
|
33
33
|
|
|
34
34
|
from gevent import sleep
|
|
35
35
|
|
|
36
|
-
from mxcubecore.Command.Exporter import Exporter
|
|
37
36
|
from mxcubecore.Command.exporter.ExporterStates import ExporterStates
|
|
38
37
|
from mxcubecore.HardwareObjects.abstract.AbstractNState import AbstractNState
|
|
39
38
|
|
mxcubecore/__init__.py
CHANGED
mxcubecore/dispatcher.py
CHANGED
|
@@ -5,7 +5,10 @@ try:
|
|
|
5
5
|
|
|
6
6
|
louie = 1
|
|
7
7
|
except ImportError:
|
|
8
|
-
|
|
8
|
+
# `dispatcher` is imported here but unused, on purpose.
|
|
9
|
+
# It is here so that one can `from mxcubecore.dispatcher import dispatcher`.
|
|
10
|
+
# Maybe this can be solved differently, though.
|
|
11
|
+
from pydispatch import dispatcher # pyright: ignore[reportMissingImports] # noqa: F401
|
|
9
12
|
from pydispatch import robustapply # pyright: ignore[reportMissingImports]
|
|
10
13
|
from pydispatch import saferef # pyright: ignore[reportMissingImports]
|
|
11
14
|
|
mxcubecore/utils/qt_import.py
CHANGED