Skip to content

Commit

Permalink
Save all files from previous change
Browse files Browse the repository at this point in the history
  • Loading branch information
noemifrisina committed Nov 2, 2023
1 parent 33e14e7 commit fe5a622
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 4 additions & 1 deletion src/mx_bluesky/I24/serial/setup_beamline/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from . import pv, setup_beamline
from .ca import caget, cagetstring, caput
from .pv_abstract import Detector, Eiger, Pilatus
from .pv_abstract import Detector, Eiger, ExperimentType, Extruder, FixedTarget, Pilatus

__all__ = [
"caget",
Expand All @@ -11,4 +11,7 @@
"Pilatus",
"pv",
"setup_beamline",
"Extruder",
"FixedTarget",
"ExperimentType",
]
7 changes: 6 additions & 1 deletion tests/I24/serial/setup_beamline/test_pv_abstract.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from mx_bluesky.I24.serial.setup_beamline import Eiger, Pilatus
from mx_bluesky.I24.serial.setup_beamline import Eiger, Extruder, FixedTarget, Pilatus


def test_eiger():
Expand All @@ -9,3 +9,8 @@ def test_eiger():
def test_pilatus():
pil = Pilatus()
assert pil.image_size_mm == (423.636, 434.644)


def test_experiment_types():
assert Extruder().expt_type.value == "Serial Jet"
assert FixedTarget().expt_type.value == "Serial Fixed"

0 comments on commit fe5a622

Please sign in to comment.