From fe5a622f0344760a56200fa822f003b3ed3b1e84 Mon Sep 17 00:00:00 2001
From: Noemi Frisina <noemi.frisina@diamond.ac.uk>
Date: Thu, 2 Nov 2023 17:40:47 +0000
Subject: [PATCH] Save all files from previous change

---
 src/mx_bluesky/I24/serial/setup_beamline/__init__.py | 5 ++++-
 tests/I24/serial/setup_beamline/test_pv_abstract.py  | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/mx_bluesky/I24/serial/setup_beamline/__init__.py b/src/mx_bluesky/I24/serial/setup_beamline/__init__.py
index f4dcfd8ec..f147d78e1 100644
--- a/src/mx_bluesky/I24/serial/setup_beamline/__init__.py
+++ b/src/mx_bluesky/I24/serial/setup_beamline/__init__.py
@@ -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",
@@ -11,4 +11,7 @@
     "Pilatus",
     "pv",
     "setup_beamline",
+    "Extruder",
+    "FixedTarget",
+    "ExperimentType",
 ]
diff --git a/tests/I24/serial/setup_beamline/test_pv_abstract.py b/tests/I24/serial/setup_beamline/test_pv_abstract.py
index 3a816b97e..dffe8cf3a 100644
--- a/tests/I24/serial/setup_beamline/test_pv_abstract.py
+++ b/tests/I24/serial/setup_beamline/test_pv_abstract.py
@@ -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():
@@ -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"