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
mxcubecore/Command/Sardana.py
CHANGED
|
@@ -18,13 +18,8 @@ Example XML::
|
|
|
18
18
|
|
|
19
19
|
"""
|
|
20
20
|
|
|
21
|
-
import logging
|
|
22
|
-
|
|
23
21
|
from ALBAEpsActuator import ALBAEpsActuator
|
|
24
22
|
|
|
25
|
-
from mxcubecore import BaseHardwareObjects
|
|
26
|
-
from mxcubecore import HardwareRepository as HWR
|
|
27
|
-
|
|
28
23
|
|
|
29
24
|
class ALBAFrontEnd(ALBAEpsActuator):
|
|
30
25
|
def init(self):
|
|
@@ -55,16 +55,7 @@ Example Hardware Object XML file :
|
|
|
55
55
|
"""
|
|
56
56
|
|
|
57
57
|
import logging
|
|
58
|
-
import time
|
|
59
|
-
from datetime import (
|
|
60
|
-
datetime,
|
|
61
|
-
timedelta,
|
|
62
|
-
)
|
|
63
58
|
|
|
64
|
-
from gevent import spawn
|
|
65
|
-
from urllib2 import urlopen
|
|
66
|
-
|
|
67
|
-
from mxcubecore import HardwareRepository as HWR
|
|
68
59
|
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
69
60
|
|
|
70
61
|
__author__ = "Jordi Andreu"
|
|
@@ -55,16 +55,7 @@ Example Hardware Object XML file :
|
|
|
55
55
|
"""
|
|
56
56
|
|
|
57
57
|
import logging
|
|
58
|
-
import time
|
|
59
|
-
from datetime import (
|
|
60
|
-
datetime,
|
|
61
|
-
timedelta,
|
|
62
|
-
)
|
|
63
58
|
|
|
64
|
-
from gevent import spawn
|
|
65
|
-
from urllib2 import urlopen
|
|
66
|
-
|
|
67
|
-
from mxcubecore import HardwareRepository as HWR
|
|
68
59
|
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
69
60
|
|
|
70
61
|
__author__ = "Jordi Andreu"
|
|
@@ -22,15 +22,7 @@ __copyright__ = """Copyright The MXCuBE Collaboration"""
|
|
|
22
22
|
__license__ = "LGPLv3+"
|
|
23
23
|
|
|
24
24
|
|
|
25
|
-
import gevent
|
|
26
|
-
import numpy
|
|
27
|
-
from gevent import Timeout
|
|
28
|
-
|
|
29
25
|
# import DeviceProxy function and DevState:
|
|
30
|
-
from PyTango import (
|
|
31
|
-
DeviceProxy,
|
|
32
|
-
DevState,
|
|
33
|
-
)
|
|
34
26
|
|
|
35
27
|
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
36
28
|
|
|
@@ -42,13 +42,11 @@ except ImportError:
|
|
|
42
42
|
traceback.print_exc()
|
|
43
43
|
redis_flag = False
|
|
44
44
|
|
|
45
|
-
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
46
45
|
from mxcubecore.HardwareObjects.abstract.AbstractVideoDevice import AbstractVideoDevice
|
|
47
46
|
from mxcubecore.utils.conversion import string_types
|
|
48
47
|
from mxcubecore.utils.qt_import import (
|
|
49
48
|
QImage,
|
|
50
49
|
QPixmap,
|
|
51
|
-
QPoint,
|
|
52
50
|
)
|
|
53
51
|
|
|
54
52
|
|
|
@@ -26,7 +26,6 @@ from enum import (
|
|
|
26
26
|
unique,
|
|
27
27
|
)
|
|
28
28
|
|
|
29
|
-
from mxcubecore.BaseHardwareObjects import HardwareObjectState
|
|
30
29
|
from mxcubecore.HardwareObjects.abstract.AbstractShutter import AbstractNState
|
|
31
30
|
|
|
32
31
|
__credits__ = ["DESY P11"]
|
|
@@ -39,8 +38,6 @@ from enum import (
|
|
|
39
38
|
unique,
|
|
40
39
|
)
|
|
41
40
|
|
|
42
|
-
from mxcubecore.HardwareObjects.abstract.AbstractShutter import AbstractShutter
|
|
43
|
-
|
|
44
41
|
|
|
45
42
|
@unique
|
|
46
43
|
class BackLightValues(Enum):
|
|
@@ -23,12 +23,9 @@ __license__ = "LGPLv3+"
|
|
|
23
23
|
__credits__ = ["DESY P11"]
|
|
24
24
|
__category__ = "General"
|
|
25
25
|
|
|
26
|
-
import numpy as np
|
|
27
26
|
|
|
28
|
-
from mxcubecore.BaseHardwareObjects import HardwareObjectState
|
|
29
27
|
from mxcubecore.HardwareObjects.abstract.AbstractBeam import (
|
|
30
28
|
AbstractBeam,
|
|
31
|
-
BeamShape,
|
|
32
29
|
)
|
|
33
30
|
|
|
34
31
|
|
|
@@ -30,7 +30,6 @@ from XSDataCommon import (
|
|
|
30
30
|
XSDataAngle,
|
|
31
31
|
XSDataBoolean,
|
|
32
32
|
XSDataDouble,
|
|
33
|
-
XSDataFile,
|
|
34
33
|
XSDataFlux,
|
|
35
34
|
XSDataImage,
|
|
36
35
|
XSDataInteger,
|
|
@@ -47,13 +46,7 @@ from XSDataMXCuBEv1_4 import (
|
|
|
47
46
|
)
|
|
48
47
|
|
|
49
48
|
from mxcubecore import HardwareRepository as HWR
|
|
50
|
-
from mxcubecore.HardwareObjects.abstract.AbstractCharacterisation import (
|
|
51
|
-
AbstractCharacterisation,
|
|
52
|
-
)
|
|
53
49
|
from mxcubecore.HardwareObjects.EDNACharacterisation import EDNACharacterisation
|
|
54
|
-
from mxcubecore.HardwareObjects.SecureXMLRpcRequestHandler import (
|
|
55
|
-
SecureXMLRpcRequestHandler,
|
|
56
|
-
)
|
|
57
50
|
from mxcubecore.model import queue_model_enumerables as qme
|
|
58
51
|
from mxcubecore.model import queue_model_objects as qmo
|
|
59
52
|
|
|
@@ -23,7 +23,6 @@ __license__ = "LGPLv3+"
|
|
|
23
23
|
|
|
24
24
|
from enum import Enum
|
|
25
25
|
|
|
26
|
-
from mxcubecore.BaseHardwareObjects import HardwareObjectState
|
|
27
26
|
from mxcubecore.HardwareObjects.abstract.AbstractShutter import AbstractNState
|
|
28
27
|
|
|
29
28
|
__credits__ = ["DESY P11"]
|
|
@@ -32,8 +31,6 @@ __category__ = "General"
|
|
|
32
31
|
|
|
33
32
|
from enum import Enum
|
|
34
33
|
|
|
35
|
-
from mxcubecore.HardwareObjects.abstract.AbstractShutter import AbstractShutter
|
|
36
|
-
|
|
37
34
|
|
|
38
35
|
class P11FastShutter(AbstractNState):
|
|
39
36
|
"""
|
|
@@ -30,8 +30,6 @@ from enum import (
|
|
|
30
30
|
|
|
31
31
|
import gevent
|
|
32
32
|
|
|
33
|
-
import mxcubecore.HardwareObjects.abstract.AbstractShutter as absshut
|
|
34
|
-
from mxcubecore.BaseHardwareObjects import HardwareObjectState
|
|
35
33
|
from mxcubecore.HardwareObjects.abstract.AbstractShutter import AbstractShutter
|
|
36
34
|
|
|
37
35
|
__credits__ = ["DESY P11"]
|
|
@@ -19,19 +19,9 @@
|
|
|
19
19
|
|
|
20
20
|
import logging
|
|
21
21
|
import os
|
|
22
|
-
import tempfile
|
|
23
|
-
from csv import reader
|
|
24
22
|
from datetime import datetime
|
|
25
|
-
from random import random
|
|
26
|
-
from time import sleep
|
|
27
23
|
|
|
28
24
|
import gevent
|
|
29
|
-
import numpy
|
|
30
|
-
import numpy as np
|
|
31
|
-
import tine
|
|
32
|
-
from matplotlib.backends.backend_agg import FigureCanvasAgg
|
|
33
|
-
from matplotlib.figure import Figure
|
|
34
|
-
from scipy.interpolate import interp1d
|
|
35
25
|
|
|
36
26
|
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
37
27
|
from mxcubecore.HardwareObjects import SimpleHTML
|
|
@@ -17,7 +17,6 @@
|
|
|
17
17
|
# You should have received a copy of the GNU Lesser General Public License
|
|
18
18
|
# along with MXCuBE. If not, see <http://www.gnu.org/licenses/>.
|
|
19
19
|
|
|
20
|
-
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
21
20
|
from mxcubecore.HardwareObjects.abstract.AbstractMotor import AbstractMotor
|
|
22
21
|
|
|
23
22
|
__credits__ = ["EMBL Hamburg"]
|
|
@@ -35,7 +35,6 @@ except ImportError:
|
|
|
35
35
|
|
|
36
36
|
from mxcubecore import HardwareRepository as HWR
|
|
37
37
|
from mxcubecore.HardwareObjects.GenericDiffractometer import GenericDiffractometer
|
|
38
|
-
from mxcubecore.TaskUtils import task
|
|
39
38
|
|
|
40
39
|
__credits__ = ["EMBL Hamburg"]
|
|
41
40
|
__category__ = "General"
|
|
@@ -21,8 +21,6 @@ import logging
|
|
|
21
21
|
|
|
22
22
|
import gevent
|
|
23
23
|
|
|
24
|
-
from mxcubecore import HardwareRepository as HWR
|
|
25
|
-
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
26
24
|
from mxcubecore.HardwareObjects.abstract.AbstractXRFSpectrum import AbstractXRFSpectrum
|
|
27
25
|
|
|
28
26
|
__credits__ = ["EMBL Hamburg"]
|
|
@@ -37,14 +37,11 @@ Example xml file:
|
|
|
37
37
|
|
|
38
38
|
import ast
|
|
39
39
|
|
|
40
|
-
import gevent
|
|
41
|
-
|
|
42
40
|
from mxcubecore.HardwareObjects.BeamlineActions import (
|
|
43
41
|
BeamlineActions,
|
|
44
42
|
ControllerCommand,
|
|
45
43
|
HWObjActuatorCommand,
|
|
46
44
|
)
|
|
47
|
-
from mxcubecore.TaskUtils import task
|
|
48
45
|
|
|
49
46
|
__copyright__ = """ Copyright © 2010-2023 by the MXCuBE collaboration """
|
|
50
47
|
__license__ = "LGPLv3+"
|
|
@@ -11,13 +11,9 @@ import time
|
|
|
11
11
|
|
|
12
12
|
import gevent
|
|
13
13
|
import numpy
|
|
14
|
-
from matplotlib.backends.backend_agg import FigureCanvasAgg
|
|
15
|
-
from matplotlib.figure import Figure
|
|
16
14
|
|
|
17
15
|
from mxcubecore import HardwareRepository as HWR
|
|
18
|
-
from mxcubecore.BaseHardwareObjects import HardwareObject
|
|
19
16
|
from mxcubecore.HardwareObjects.abstract.AbstractEnergyScan import AbstractEnergyScan
|
|
20
|
-
from mxcubecore.TaskUtils import task
|
|
21
17
|
|
|
22
18
|
|
|
23
19
|
class GetStaticParameters:
|
|
@@ -2,10 +2,7 @@ import logging
|
|
|
2
2
|
import os
|
|
3
3
|
import shutil
|
|
4
4
|
|
|
5
|
-
import gevent
|
|
6
|
-
|
|
7
5
|
from mxcubecore import HardwareRepository as HWR
|
|
8
|
-
from mxcubecore.HardwareObjects.LimaPilatusDetector import LimaPilatusDetector
|
|
9
6
|
from mxcubecore.TaskUtils import task
|
|
10
7
|
|
|
11
8
|
from .ESRFMultiCollect import ESRFMultiCollect
|
|
@@ -1,14 +1,6 @@
|
|
|
1
|
-
import enum
|
|
2
1
|
import logging
|
|
3
|
-
import os
|
|
4
|
-
import subprocess
|
|
5
2
|
|
|
6
3
|
import gevent
|
|
7
|
-
from devtools import debug
|
|
8
|
-
from pydantic.v1 import (
|
|
9
|
-
BaseModel,
|
|
10
|
-
Field,
|
|
11
|
-
)
|
|
12
4
|
|
|
13
5
|
from mxcubecore import HardwareRepository as HWR
|
|
14
6
|
from mxcubecore.HardwareObjects.ESRF.queue_entry.ssx_base_queue_entry import (
|
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
from devtools import debug
|
|
2
|
-
from pydantic.v1 import (
|
|
3
|
-
BaseModel,
|
|
4
|
-
Field,
|
|
5
|
-
)
|
|
6
|
-
from typing_extensions import Literal
|
|
7
2
|
|
|
8
|
-
from mxcubecore import HardwareRepository as HWR
|
|
9
3
|
from mxcubecore.HardwareObjects.ESRF.queue_entry.ssx_base_queue_entry import (
|
|
10
4
|
BaseUserCollectionParameters,
|
|
11
5
|
SsxBaseQueueEntry,
|
|
@@ -6,7 +6,6 @@ from contextlib import ExitStack
|
|
|
6
6
|
from uuid import uuid1
|
|
7
7
|
|
|
8
8
|
import gevent
|
|
9
|
-
import numpy as np
|
|
10
9
|
from gevent import subprocess
|
|
11
10
|
from lima2.client import Detector
|
|
12
11
|
from lima2.client.smx.aggregation.writer import Writer as SmxAggregationWriter
|
|
@@ -15,7 +14,6 @@ from mxcubecore import HardwareRepository as HWR
|
|
|
15
14
|
from mxcubecore.BaseHardwareObjects import HardwareObjectState
|
|
16
15
|
from mxcubecore.CommandContainer import ConnectionError
|
|
17
16
|
from mxcubecore.HardwareObjects.abstract.AbstractDetector import AbstractDetector
|
|
18
|
-
from mxcubecore.TaskUtils import task
|
|
19
17
|
|
|
20
18
|
_logger = logging.getLogger("HWR")
|
|
21
19
|
|